home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-05-21 | 43.9 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 4d 6f 6e 20 4d | 61 72 20 20 39 20 31 32 |on Mon M|ar 9 12|
|00000040| 3a 34 38 3a 32 34 20 31 | 39 39 38 0a 3b 3b 3b 20 |:48:24 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 32 30 | 2e 33 2f 78 65 6d 61 63 |emacs/20|.3/xemac|
|00000090| 73 2d 32 30 2e 33 2f 6c | 69 73 70 2f 65 64 69 66 |s-20.3/l|isp/edif|
|000000a0| 66 2f 65 64 69 66 66 2d | 6d 75 6c 74 2e 65 6c 0a |f/ediff-|mult.el.|
|000000b0| 3b 3b 3b 20 65 6d 61 63 | 73 20 76 65 72 73 69 6f |;;; emac|s versio|
|000000c0| 6e 20 32 30 2e 34 20 22 | 45 6d 65 72 61 6c 64 22 |n 20.4 "|Emerald"|
|000000d0| 20 58 45 6d 61 63 73 20 | 20 4c 75 63 69 64 2e 0a | XEmacs | Lucid..|
|000000e0| 3b 3b 3b 20 62 79 74 65 | 63 6f 6d 70 20 76 65 72 |;;; byte|comp ver|
|000000f0| 73 69 6f 6e 20 32 2e 32 | 35 20 58 45 6d 61 63 73 |sion 2.2|5 XEmacs|
|00000100| 3b 20 32 32 2d 4d 61 72 | 2d 39 36 2e 0a 3b 3b 3b |; 22-Mar|-96..;;;|
|00000110| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000120| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000130| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000140| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000150| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 39 2e 0a |st in Em|acs 19..|
|00000160| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000170| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000180| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000190| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|000001a0| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|000001b0| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. | (str|
|000001c0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001d0| 76 65 72 73 69 6f 6e 20 | 22 32 30 22 29 29 29 0a |version |"20"))).|
|000001e0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 60 65 64 69 | (err|or "`edi|
|000001f0| 66 66 2d 6d 75 6c 74 2e | 65 6c 27 20 77 61 73 20 |ff-mult.|el' was |
|00000200| 63 6f 6d 70 69 6c 65 64 | 20 66 6f 72 20 45 6d 61 |compiled| for Ema|
|00000210| 63 73 20 32 30 22 29 29 | 0a 0a 28 6f 72 20 28 62 |cs 20"))|..(or (b|
|00000220| 6f 75 6e 64 70 20 27 63 | 75 72 72 65 6e 74 2d 6c |oundp 'c|urrent-l|
|00000230| 6f 61 64 2d 6c 69 73 74 | 29 20 28 73 65 74 71 20 |oad-list|) (setq |
|00000240| 63 75 72 72 65 6e 74 2d | 6c 6f 61 64 2d 6c 69 73 |current-|load-lis|
|00000250| 74 20 6e 69 6c 29 29 0a | 0a 0a 28 62 79 74 65 2d |t nil)).|..(byte-|
|00000260| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 c5 c6 |code "..|!.......|
|00000270| c7 c8 26 07 88 c9 ca 21 | 88 c9 cb 21 87 22 20 5b |..&....!|...!." [|
|00000280| 70 72 6f 76 69 64 65 20 | 65 64 69 66 66 2d 6d 75 |provide |ediff-mu|
|00000290| 6c 74 20 63 75 73 74 6f | 6d 2d 64 65 63 6c 61 72 |lt custo|m-declar|
|000002a0| 65 2d 67 72 6f 75 70 20 | 6e 69 6c 20 22 4d 75 6c |e-group |nil "Mul|
|000002b0| 74 69 2d 66 69 6c 65 20 | 61 6e 64 20 6d 75 6c 74 |ti-file |and mult|
|000002c0| 69 2d 62 75 66 66 65 72 | 20 70 72 6f 63 65 73 73 |i-buffer| process|
|000002d0| 69 6e 67 20 69 6e 20 45 | 64 69 66 66 22 20 3a 70 |ing in E|diff" :p|
|000002e0| 72 65 66 69 78 20 22 65 | 64 69 66 66 2d 22 20 3a |refix "e|diff-" :|
|000002f0| 67 72 6f 75 70 20 65 64 | 69 66 66 20 72 65 71 75 |group ed|iff requ|
|00000300| 69 72 65 20 65 64 69 66 | 66 2d 69 6e 69 74 20 65 |ire edif|f-init e|
|00000310| 64 69 66 66 2d 75 74 69 | 6c 5d 20 38 29 0a 23 40 |diff-uti|l] 8).#@|
|00000320| 32 20 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |2 ..(def|var edif|
|00000330| 66 2d 6d 65 74 61 2d 62 | 75 66 66 65 72 20 6e 69 |f-meta-b|uffer ni|
|00000340| 6c 20 28 23 24 20 2e 20 | 38 30 32 29 29 0a 28 62 |l (#$ . |802)).(b|
|00000350| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00000360| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00000370| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00000380| 6c 20 65 64 69 66 66 2d | 6d 65 74 61 2d 62 75 66 |l ediff-|meta-buf|
|00000390| 66 65 72 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |fer put |permanen|
|000003a0| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 23 40 |t-local |t] 4).#@|
|000003b0| 32 20 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |2 ..(def|var edif|
|000003c0| 66 2d 70 61 72 65 6e 74 | 2d 6d 65 74 61 2d 62 75 |f-parent|-meta-bu|
|000003d0| 66 66 65 72 20 6e 69 6c | 20 28 23 24 20 2e 20 39 |ffer nil| (#$ . 9|
|000003e0| 34 36 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |46)).(by|te-code |
|000003f0| 22 c0 c1 21 88 c2 c1 c3 | c4 23 88 c5 c6 21 ac 83 |"..!....|.#...!..|
|00000400| c7 16 06 c6 0e 08 42 16 | 08 c9 16 5c 6e ca 0e 08 |......B.|...\n...|
|00000410| 42 16 08 c7 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |B...." [|make-var|
|00000420| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00000430| 61 6c 20 65 64 69 66 66 | 2d 70 61 72 65 6e 74 2d |al ediff|-parent-|
|00000440| 6d 65 74 61 2d 62 75 66 | 66 65 72 20 70 75 74 20 |meta-buf|fer put |
|00000450| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00000460| 74 20 62 6f 75 6e 64 70 | 20 65 64 69 66 66 2d 72 |t boundp| ediff-r|
|00000470| 65 67 69 73 74 72 79 2d | 62 75 66 66 65 72 20 6e |egistry-|buffer n|
|00000480| 69 6c 20 63 75 72 72 65 | 6e 74 2d 6c 6f 61 64 2d |il curre|nt-load-|
|00000490| 6c 69 73 74 20 22 54 68 | 69 73 20 69 73 20 61 6e |list "Th|is is an|
|000004a0| 20 45 64 69 66 66 20 53 | 65 73 73 69 6f 6e 20 47 | Ediff S|ession G|
|000004b0| 72 6f 75 70 20 50 61 6e | 65 6c 3a 20 25 73 5c 6e |roup Pan|el: %s\n|
|000004c0| 5c 6e 55 73 65 66 75 6c | 20 63 6f 6d 6d 61 6e 64 |\nUseful| command|
|000004d0| 73 3a 5c 6e 20 20 20 20 | 20 62 75 74 74 6f 6e 32 |s:\n | button2|
|000004e0| 2c 20 76 2c 20 6f 72 20 | 52 45 54 20 6f 76 65 72 |, v, or |RET over|
|000004f0| 20 73 65 73 73 69 6f 6e | 20 72 65 63 6f 72 64 3a | session| record:|
|00000500| 20 20 20 73 74 61 72 74 | 20 74 68 61 74 20 45 64 | start| that Ed|
|00000510| 69 66 66 20 73 65 73 73 | 69 6f 6e 5c 6e 20 20 20 |iff sess|ion\n |
|00000520| 20 20 4d 3a 09 69 6e 20 | 73 65 73 73 69 6f 6e 73 | M:.in |sessions|
|00000530| 20 69 6e 76 6f 6b 65 64 | 20 66 72 6f 6d 20 68 65 | invoked| from he|
|00000540| 72 65 2c 20 62 72 69 6e | 67 73 20 62 61 63 6b 20 |re, brin|gs back |
|00000550| 74 68 69 73 20 67 72 6f | 75 70 20 70 61 6e 65 6c |this gro|up panel|
|00000560| 5c 6e 20 20 20 20 20 52 | 3a 09 64 69 73 70 6c 61 |\n R|:.displa|
|00000570| 79 20 74 68 65 20 72 65 | 67 69 73 74 72 79 20 6f |y the re|gistry o|
|00000580| 66 20 61 63 74 69 76 65 | 20 45 64 69 66 66 20 73 |f active| Ediff s|
|00000590| 65 73 73 69 6f 6e 73 5c | 6e 20 20 20 20 20 68 3a |essions\|n h:|
|000005a0| 09 6d 61 72 6b 20 73 65 | 73 73 69 6f 6e 20 66 6f |.mark se|ssion fo|
|000005b0| 72 20 68 69 64 69 6e 67 | 20 28 74 6f 67 67 6c 65 |r hiding| (toggle|
|000005c0| 29 5c 6e 20 20 20 20 20 | 78 3a 09 68 69 64 65 20 |)\n |x:.hide |
|000005d0| 6d 61 72 6b 65 64 20 73 | 65 73 73 69 6f 6e 73 3b |marked s|essions;|
|000005e0| 20 77 69 74 68 20 70 72 | 65 66 69 78 20 61 72 67 | with pr|efix arg|
|000005f0| 3a 20 75 6e 68 69 64 65 | 5c 6e 20 20 20 20 20 6d |: unhide|\n m|
|00000600| 3a 09 6d 61 72 6b 20 73 | 65 73 73 69 6f 6e 20 66 |:.mark s|ession f|
|00000610| 6f 72 20 61 20 6e 6f 6e | 2d 68 69 64 69 6e 67 20 |or a non|-hiding |
|00000620| 6f 70 65 72 61 74 69 6f | 6e 20 28 74 6f 67 67 6c |operatio|n (toggl|
|00000630| 65 29 5c 6e 20 6e 2c 53 | 50 43 3a 09 6e 65 78 74 |e)\n n,S|PC:.next|
|00000640| 20 73 65 73 73 69 6f 6e | 5c 6e 20 70 2c 44 45 4c | session|\n p,DEL|
|00000650| 3a 09 70 72 65 76 69 6f | 75 73 20 73 65 73 73 69 |:.previo|us sessi|
|00000660| 6f 6e 5c 6e 20 20 20 20 | 20 45 3a 09 62 72 6f 77 |on\n | E:.brow|
|00000670| 73 65 20 45 64 69 66 66 | 20 6f 6e 2d 6c 69 6e 65 |se Ediff| on-line|
|00000680| 20 6d 61 6e 75 61 6c 5c | 6e 20 20 20 20 20 54 3a | manual\|n T:|
|00000690| 09 74 6f 67 67 6c 65 20 | 74 72 75 6e 63 61 74 69 |.toggle |truncati|
|000006a0| 6f 6e 20 6f 66 20 6c 6f | 6e 67 20 66 69 6c 65 20 |on of lo|ng file |
|000006b0| 6e 61 6d 65 73 5c 6e 20 | 20 20 20 20 71 3a 09 71 |names\n | q:.q|
|000006c0| 75 69 74 20 74 68 69 73 | 20 73 65 73 73 69 6f 6e |uit this| session|
|000006d0| 20 67 72 6f 75 70 5c 6e | 22 20 65 64 69 66 66 2d | group\n|" ediff-|
|000006e0| 6d 65 74 61 2d 62 75 66 | 66 65 72 2d 6d 65 73 73 |meta-buf|fer-mess|
|000006f0| 61 67 65 5d 20 34 29 0a | 23 40 33 33 20 54 68 65 |age] 4).|#@33 The|
|00000700| 20 6b 65 79 6d 61 70 20 | 66 6f 72 20 74 68 65 20 | keymap |for the |
|00000710| 6d 65 74 61 20 62 75 66 | 66 65 72 2e 1f 0a 28 64 |meta buf|fer...(d|
|00000720| 65 66 76 61 72 20 65 64 | 69 66 66 2d 6d 65 74 61 |efvar ed|iff-meta|
|00000730| 2d 62 75 66 66 65 72 2d | 6d 61 70 20 6e 69 6c 20 |-buffer-|map nil |
|00000740| 28 23 24 20 2e 20 31 37 | 38 39 29 29 0a 28 62 79 |(#$ . 17|89)).(by|
|00000750| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00000760| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00000770| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00000780| 20 65 64 69 66 66 2d 6d | 65 74 61 2d 62 75 66 66 | ediff-m|eta-buff|
|00000790| 65 72 2d 6d 61 70 20 70 | 75 74 20 70 65 72 6d 61 |er-map p|ut perma|
|000007a0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 5d 20 34 29 |nent-loc|al t] 4)|
|000007b0| 0a 23 40 38 33 20 54 68 | 65 20 6b 65 79 6d 61 70 |.#@83 Th|e keymap|
|000007c0| 20 74 6f 20 62 65 20 69 | 6e 73 74 61 6c 6c 65 64 | to be i|nstalled|
|000007d0| 20 69 6e 20 74 68 65 20 | 62 75 66 66 65 72 20 73 | in the |buffer s|
|000007e0| 68 6f 77 69 6e 67 20 64 | 69 66 66 65 72 65 6e 63 |howing d|ifferenc|
|000007f0| 65 73 20 62 65 74 77 65 | 65 6e 0a 64 69 72 65 63 |es betwe|en.direc|
|00000800| 74 6f 72 69 65 73 2e 1f | 0a 28 64 65 66 76 61 72 |tories..|.(defvar|
|00000810| 20 65 64 69 66 66 2d 64 | 69 72 2d 64 69 66 66 73 | ediff-d|ir-diffs|
|00000820| 2d 62 75 66 66 65 72 2d | 6d 61 70 20 28 6d 61 6b |-buffer-|map (mak|
|00000830| 65 2d 73 70 61 72 73 65 | 2d 6b 65 79 6d 61 70 29 |e-sparse|-keymap)|
|00000840| 20 28 23 24 20 2e 20 31 | 39 37 34 29 29 0a 23 40 | (#$ . 1|974)).#@|
|00000850| 32 20 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |2 ..(def|var edif|
|00000860| 66 2d 6d 65 74 61 2d 61 | 63 74 69 6f 6e 2d 66 75 |f-meta-a|ction-fu|
|00000870| 6e 63 74 69 6f 6e 20 6e | 69 6c 20 28 23 24 20 2e |nction n|il (#$ .|
|00000880| 20 32 31 33 30 29 29 0a | 28 62 79 74 65 2d 63 6f | 2130)).|(byte-co|
|00000890| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|000008a0| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|000008b0| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|000008c0| 66 2d 6d 65 74 61 2d 61 | 63 74 69 6f 6e 2d 66 75 |f-meta-a|ction-fu|
|000008d0| 6e 63 74 69 6f 6e 20 70 | 75 74 20 70 65 72 6d 61 |nction p|ut perma|
|000008e0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 5d 20 34 29 |nent-loc|al t] 4)|
|000008f0| 0a 23 40 32 20 1f 0a 28 | 64 65 66 76 61 72 20 65 |.#@2 ..(|defvar e|
|00000900| 64 69 66 66 2d 6d 65 74 | 61 2d 72 65 64 72 61 77 |diff-met|a-redraw|
|00000910| 2d 66 75 6e 63 74 69 6f | 6e 20 6e 69 6c 20 28 23 |-functio|n nil (#|
|00000920| 24 20 2e 20 32 32 39 33 | 29 29 0a 28 62 79 74 65 |$ . 2293|)).(byte|
|00000930| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00000940| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00000950| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00000960| 64 69 66 66 2d 6d 65 74 | 61 2d 72 65 64 72 61 77 |diff-met|a-redraw|
|00000970| 2d 66 75 6e 63 74 69 6f | 6e 20 70 75 74 20 70 65 |-functio|n put pe|
|00000980| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00000990| 20 34 29 0a 23 40 32 20 | 1f 0a 28 64 65 66 76 61 | 4).#@2 |..(defva|
|000009a0| 72 20 65 64 69 66 66 2d | 73 65 73 73 69 6f 6e 2d |r ediff-|session-|
|000009b0| 61 63 74 69 6f 6e 2d 66 | 75 6e 63 74 69 6f 6e 20 |action-f|unction |
|000009c0| 6e 69 6c 20 28 23 24 20 | 2e 20 32 34 35 36 29 29 |nil (#$ |. 2456))|
|000009d0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|000009e0| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|000009f0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00000a00| 6f 63 61 6c 20 65 64 69 | 66 66 2d 73 65 73 73 69 |ocal edi|ff-sessi|
|00000a10| 6f 6e 2d 61 63 74 69 6f | 6e 2d 66 75 6e 63 74 69 |on-actio|n-functi|
|00000a20| 6f 6e 20 70 75 74 20 70 | 65 72 6d 61 6e 65 6e 74 |on put p|ermanent|
|00000a30| 2d 6c 6f 63 61 6c 20 74 | 5d 20 34 29 0a 23 40 32 |-local t|] 4).#@2|
|00000a40| 20 1f 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 | ..(defv|ar ediff|
|00000a50| 2d 6d 65 74 61 6a 6f 62 | 2d 6e 61 6d 65 20 6e 69 |-metajob|-name ni|
|00000a60| 6c 20 28 23 24 20 2e 20 | 32 36 32 35 29 29 0a 28 |l (#$ . |2625)).(|
|00000a70| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00000a80| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00000a90| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00000aa0| 61 6c 20 65 64 69 66 66 | 2d 6d 65 74 61 6a 6f 62 |al ediff|-metajob|
|00000ab0| 2d 6e 61 6d 65 20 70 75 | 74 20 70 65 72 6d 61 6e |-name pu|t perman|
|00000ac0| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00000ad0| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|00000ae0| 69 66 66 2d 6d 65 74 61 | 2d 64 69 66 66 2d 62 75 |iff-meta|-diff-bu|
|00000af0| 66 66 65 72 20 6e 69 6c | 20 28 23 24 20 2e 20 32 |ffer nil| (#$ . 2|
|00000b00| 37 37 32 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |772)).(b|yte-code|
|00000b10| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00000b20| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00000b30| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00000b40| 6d 65 74 61 2d 64 69 66 | 66 2d 62 75 66 66 65 72 |meta-dif|f-buffer|
|00000b50| 20 70 75 74 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c | put per|manent-l|
|00000b60| 6f 63 61 6c 20 74 5d 20 | 34 29 0a 23 40 32 20 1f |ocal t] |4).#@2 .|
|00000b70| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 66 |.(defvar| ediff-f|
|00000b80| 69 6c 74 65 72 69 6e 67 | 2d 72 65 67 65 78 70 2d |iltering|-regexp-|
|00000b90| 68 69 73 74 6f 72 79 20 | 6e 69 6c 20 28 23 24 20 |history |nil (#$ |
|00000ba0| 2e 20 32 39 32 37 29 29 | 0a 23 40 32 20 1f 0a 28 |. 2927))|.#@2 ..(|
|00000bb0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 6d 65 74 |defvar e|diff-met|
|00000bc0| 61 2d 6c 69 73 74 20 6e | 69 6c 20 28 23 24 20 2e |a-list n|il (#$ .|
|00000bd0| 20 32 39 38 39 29 29 0a | 28 62 79 74 65 2d 63 6f | 2989)).|(byte-co|
|00000be0| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|00000bf0| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00000c00| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00000c10| 66 2d 6d 65 74 61 2d 6c | 69 73 74 20 70 75 74 20 |f-meta-l|ist put |
|00000c20| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00000c30| 74 5d 20 34 29 0a 23 40 | 32 20 1f 0a 28 64 65 66 |t] 4).#@|2 ..(def|
|00000c40| 76 61 72 20 65 64 69 66 | 66 2d 6d 65 74 61 2d 73 |var edif|f-meta-s|
|00000c50| 65 73 73 69 6f 6e 2d 6e | 75 6d 62 65 72 20 6e 69 |ession-n|umber ni|
|00000c60| 6c 20 28 23 24 20 2e 20 | 33 31 33 30 29 29 0a 28 |l (#$ . |3130)).(|
|00000c70| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00000c80| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00000c90| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00000ca0| 61 6c 20 65 64 69 66 66 | 2d 6d 65 74 61 2d 73 65 |al ediff|-meta-se|
|00000cb0| 73 73 69 6f 6e 2d 6e 75 | 6d 62 65 72 20 70 75 74 |ssion-nu|mber put|
|00000cc0| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00000cd0| 20 74 5d 20 34 29 0a 23 | 40 32 20 1f 0a 28 64 65 | t] 4).#|@2 ..(de|
|00000ce0| 66 76 61 72 20 65 64 69 | 66 66 2d 64 69 72 2d 64 |fvar edi|ff-dir-d|
|00000cf0| 69 66 66 65 72 65 6e 63 | 65 2d 6c 69 73 74 20 6e |ifferenc|e-list n|
|00000d00| 69 6c 20 28 23 24 20 2e | 20 33 32 39 31 29 29 0a |il (#$ .| 3291)).|
|00000d10| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00000d20| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00000d30| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00000d40| 63 61 6c 20 65 64 69 66 | 66 2d 64 69 72 2d 64 69 |cal edif|f-dir-di|
|00000d50| 66 66 65 72 65 6e 63 65 | 2d 6c 69 73 74 20 70 75 |fference|-list pu|
|00000d60| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00000d70| 6c 20 74 5d 20 34 29 0a | 23 40 32 20 1f 0a 28 64 |l t] 4).|#@2 ..(d|
|00000d80| 65 66 76 61 72 20 65 64 | 69 66 66 2d 64 69 72 2d |efvar ed|iff-dir-|
|00000d90| 64 69 66 66 73 2d 62 75 | 66 66 65 72 20 6e 69 6c |diffs-bu|ffer nil|
|00000da0| 20 28 23 24 20 2e 20 33 | 34 35 32 29 29 0a 28 62 | (#$ . 3|452)).(b|
|00000db0| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00000dc0| c3 c4 23 88 c5 c6 21 ac | 83 c7 16 06 c6 0e 08 42 |..#...!.|.......B|
|00000dd0| 16 08 c7 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |...." [m|ake-vari|
|00000de0| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00000df0| 6c 20 65 64 69 66 66 2d | 64 69 72 2d 64 69 66 66 |l ediff-|dir-diff|
|00000e00| 73 2d 62 75 66 66 65 72 | 20 70 75 74 20 70 65 72 |s-buffer| put per|
|00000e10| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 74 20 62 |manent-l|ocal t b|
|00000e20| 6f 75 6e 64 70 20 65 64 | 69 66 66 2d 73 65 73 73 |oundp ed|iff-sess|
|00000e30| 69 6f 6e 2d 72 65 67 69 | 73 74 72 79 20 6e 69 6c |ion-regi|stry nil|
|00000e40| 20 63 75 72 72 65 6e 74 | 2d 6c 6f 61 64 2d 6c 69 | current|-load-li|
|00000e50| 73 74 5d 20 34 29 0a 28 | 63 75 73 74 6f 6d 2d 64 |st] 4).(|custom-d|
|00000e60| 65 63 6c 61 72 65 2d 76 | 61 72 69 61 62 6c 65 20 |eclare-v|ariable |
|00000e70| 27 65 64 69 66 66 2d 6d | 65 74 61 2d 74 72 75 6e |'ediff-m|eta-trun|
|00000e80| 63 61 74 65 2d 66 69 6c | 65 6e 61 6d 65 73 20 27 |cate-fil|enames '|
|00000e90| 74 20 22 2a 49 66 20 6e | 6f 6e 2d 6e 69 6c 2c 20 |t "*If n|on-nil, |
|00000ea0| 74 72 75 6e 63 61 74 65 | 20 6c 6f 6e 67 20 66 69 |truncate| long fi|
|00000eb0| 6c 65 20 6e 61 6d 65 73 | 20 69 6e 20 74 68 65 20 |le names| in the |
|00000ec0| 73 65 73 73 69 6f 6e 20 | 67 72 6f 75 70 20 62 75 |session |group bu|
|00000ed0| 66 66 65 72 73 2e 5c 6e | 54 68 69 73 20 63 61 6e |ffers.\n|This can|
|00000ee0| 20 62 65 20 74 6f 67 67 | 6c 65 64 20 77 69 74 68 | be togg|led with|
|00000ef0| 20 60 65 64 69 66 66 2d | 74 6f 67 67 6c 65 2d 66 | `ediff-|toggle-f|
|00000f00| 69 6c 65 6e 61 6d 65 2d | 74 72 75 6e 63 61 74 69 |ilename-|truncati|
|00000f10| 6f 6e 27 2e 22 20 3a 74 | 79 70 65 20 27 68 6f 6f |on'." :t|ype 'hoo|
|00000f20| 6b 20 3a 67 72 6f 75 70 | 20 27 65 64 69 66 66 2d |k :group| 'ediff-|
|00000f30| 6d 75 6c 74 29 0a 28 63 | 75 73 74 6f 6d 2d 64 65 |mult).(c|ustom-de|
|00000f40| 63 6c 61 72 65 2d 76 61 | 72 69 61 62 6c 65 20 27 |clare-va|riable '|
|00000f50| 65 64 69 66 66 2d 72 65 | 67 69 73 74 72 79 2d 73 |ediff-re|gistry-s|
|00000f60| 65 74 75 70 2d 68 6f 6f | 6b 20 27 6e 69 6c 20 22 |etup-hoo|k 'nil "|
|00000f70| 2a 48 6f 6f 6b 73 20 72 | 75 6e 20 6a 75 73 74 20 |*Hooks r|un just |
|00000f80| 61 66 74 65 72 20 74 68 | 65 20 72 65 67 69 73 74 |after th|e regist|
|00000f90| 72 79 20 63 6f 6e 74 72 | 6f 6c 20 70 61 6e 65 6c |ry contr|ol panel|
|00000fa0| 20 69 73 20 73 65 74 20 | 75 70 2e 22 20 3a 74 79 | is set |up." :ty|
|00000fb0| 70 65 20 27 68 6f 6f 6b | 20 3a 67 72 6f 75 70 20 |pe 'hook| :group |
|00000fc0| 27 65 64 69 66 66 2d 6d | 75 6c 74 29 0a 28 63 75 |'ediff-m|ult).(cu|
|00000fd0| 73 74 6f 6d 2d 64 65 63 | 6c 61 72 65 2d 76 61 72 |stom-dec|lare-var|
|00000fe0| 69 61 62 6c 65 20 27 65 | 64 69 66 66 2d 73 65 73 |iable 'e|diff-ses|
|00000ff0| 73 69 6f 6e 2d 67 72 6f | 75 70 2d 73 65 74 75 70 |sion-gro|up-setup|
|00001000| 2d 68 6f 6f 6b 20 27 6e | 69 6c 20 22 2a 48 6f 6f |-hook 'n|il "*Hoo|
|00001010| 6b 73 20 72 75 6e 20 6a | 75 73 74 20 61 66 74 65 |ks run j|ust afte|
|00001020| 72 20 61 20 6d 65 74 61 | 2d 62 75 66 66 65 72 20 |r a meta|-buffer |
|00001030| 63 6f 6e 74 72 6f 6c 6c | 69 6e 67 20 61 20 73 65 |controll|ing a se|
|00001040| 73 73 69 6f 6e 20 67 72 | 6f 75 70 2c 20 73 75 63 |ssion gr|oup, suc|
|00001050| 68 20 61 73 5c 6e 65 64 | 69 66 66 2d 64 69 72 65 |h as\ned|iff-dire|
|00001060| 63 74 6f 72 69 65 73 2c | 20 69 73 20 72 75 6e 2e |ctories,| is run.|
|00001070| 22 20 3a 74 79 70 65 20 | 27 68 6f 6f 6b 20 3a 67 |" :type |'hook :g|
|00001080| 72 6f 75 70 20 27 65 64 | 69 66 66 2d 6d 75 6c 74 |roup 'ed|iff-mult|
|00001090| 29 0a 28 63 75 73 74 6f | 6d 2d 64 65 63 6c 61 72 |).(custo|m-declar|
|000010a0| 65 2d 76 61 72 69 61 62 | 6c 65 20 27 65 64 69 66 |e-variab|le 'edif|
|000010b0| 66 2d 71 75 69 74 2d 73 | 65 73 73 69 6f 6e 2d 67 |f-quit-s|ession-g|
|000010c0| 72 6f 75 70 2d 68 6f 6f | 6b 20 27 6e 69 6c 20 22 |roup-hoo|k 'nil "|
|000010d0| 2a 48 6f 6f 6b 73 20 72 | 75 6e 20 6a 75 73 74 20 |*Hooks r|un just |
|000010e0| 62 65 66 6f 72 65 20 65 | 78 69 74 69 6e 67 20 61 |before e|xiting a|
|000010f0| 20 73 65 73 73 69 6f 6e | 20 67 72 6f 75 70 2e 22 | session| group."|
|00001100| 20 3a 74 79 70 65 20 27 | 68 6f 6f 6b 20 3a 67 72 | :type '|hook :gr|
|00001110| 6f 75 70 20 27 65 64 69 | 66 66 2d 6d 75 6c 74 29 |oup 'edi|ff-mult)|
|00001120| 0a 28 63 75 73 74 6f 6d | 2d 64 65 63 6c 61 72 65 |.(custom|-declare|
|00001130| 2d 76 61 72 69 61 62 6c | 65 20 27 65 64 69 66 66 |-variabl|e 'ediff|
|00001140| 2d 73 68 6f 77 2d 72 65 | 67 69 73 74 72 79 2d 68 |-show-re|gistry-h|
|00001150| 6f 6f 6b 20 27 6e 69 6c | 20 22 2a 48 6f 6f 6b 73 |ook 'nil| "*Hooks|
|00001160| 20 72 75 6e 20 6a 75 73 | 74 20 61 66 74 65 72 20 | run jus|t after |
|00001170| 74 68 65 20 72 65 67 69 | 73 74 72 79 20 62 75 66 |the regi|stry buf|
|00001180| 66 65 72 20 69 73 20 73 | 68 6f 77 6e 2e 22 20 3a |fer is s|hown." :|
|00001190| 74 79 70 65 20 27 68 6f | 6f 6b 20 3a 67 72 6f 75 |type 'ho|ok :grou|
|000011a0| 70 20 27 65 64 69 66 66 | 2d 6d 75 6c 74 29 0a 28 |p 'ediff|-mult).(|
|000011b0| 63 75 73 74 6f 6d 2d 64 | 65 63 6c 61 72 65 2d 76 |custom-d|eclare-v|
|000011c0| 61 72 69 61 62 6c 65 20 | 27 65 64 69 66 66 2d 73 |ariable |'ediff-s|
|000011d0| 68 6f 77 2d 73 65 73 73 | 69 6f 6e 2d 67 72 6f 75 |how-sess|ion-grou|
|000011e0| 70 2d 68 6f 6f 6b 20 27 | 6e 69 6c 20 22 2a 48 6f |p-hook '|nil "*Ho|
|000011f0| 6f 6b 73 20 72 75 6e 20 | 6a 75 73 74 20 61 66 74 |oks run |just aft|
|00001200| 65 72 20 61 20 73 65 73 | 73 69 6f 6e 20 67 72 6f |er a ses|sion gro|
|00001210| 75 70 20 62 75 66 66 65 | 72 20 69 73 20 73 68 6f |up buffe|r is sho|
|00001220| 77 6e 2e 22 20 3a 74 79 | 70 65 20 27 68 6f 6f 6b |wn." :ty|pe 'hook|
|00001230| 20 3a 67 72 6f 75 70 20 | 27 65 64 69 66 66 2d 6d | :group |'ediff-m|
|00001240| 75 6c 74 29 0a 28 63 75 | 73 74 6f 6d 2d 64 65 63 |ult).(cu|stom-dec|
|00001250| 6c 61 72 65 2d 76 61 72 | 69 61 62 6c 65 20 27 65 |lare-var|iable 'e|
|00001260| 64 69 66 66 2d 6d 65 74 | 61 2d 62 75 66 66 65 72 |diff-met|a-buffer|
|00001270| 2d 6b 65 79 6d 61 70 2d | 73 65 74 75 70 2d 68 6f |-keymap-|setup-ho|
|00001280| 6f 6b 20 27 6e 69 6c 20 | 22 2a 48 6f 6f 6b 73 20 |ok 'nil |"*Hooks |
|00001290| 72 75 6e 20 6a 75 73 74 | 20 61 66 74 65 72 20 73 |run just| after s|
|000012a0| 65 74 74 69 6e 67 20 75 | 70 20 74 68 65 20 65 64 |etting u|p the ed|
|000012b0| 69 66 66 2d 6d 65 74 61 | 2d 62 75 66 66 65 72 2d |iff-meta|-buffer-|
|000012c0| 6d 61 70 2e 5c 6e 54 68 | 69 73 20 6b 65 79 6d 61 |map.\nTh|is keyma|
|000012d0| 70 20 63 6f 6e 74 72 6f | 6c 73 20 6b 65 79 20 62 |p contro|ls key b|
|000012e0| 69 6e 64 69 6e 67 73 20 | 69 6e 20 74 68 65 20 6d |indings |in the m|
|000012f0| 65 74 61 20 62 75 66 66 | 65 72 20 61 6e 64 20 69 |eta buff|er and i|
|00001300| 73 20 61 20 6c 6f 63 61 | 6c 20 76 61 72 69 61 62 |s a loca|l variab|
|00001310| 6c 65 2e 5c 6e 54 68 69 | 73 20 6d 65 61 6e 73 20 |le.\nThi|s means |
|00001320| 74 68 61 74 20 79 6f 75 | 20 63 61 6e 20 73 65 74 |that you| can set|
|00001330| 20 64 69 66 66 65 72 65 | 6e 74 20 62 69 6e 64 69 | differe|nt bindi|
|00001340| 6e 67 73 20 66 6f 72 20 | 64 69 66 66 65 72 65 6e |ngs for |differen|
|00001350| 74 20 6b 69 6e 64 73 20 | 6f 66 20 6d 65 74 61 5c |t kinds |of meta\|
|00001360| 6e 62 75 66 66 65 72 73 | 2e 22 20 3a 74 79 70 65 |nbuffers|." :type|
|00001370| 20 27 68 6f 6f 6b 20 3a | 67 72 6f 75 70 20 27 65 | 'hook :|group 'e|
|00001380| 64 69 66 66 2d 6d 75 6c | 74 29 0a 23 40 32 20 1f |diff-mul|t).#@2 .|
|00001390| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 6d |.(defvar| ediff-m|
|000013a0| 65 74 61 2d 70 61 74 63 | 68 62 75 66 65 72 20 6e |eta-patc|hbufer n|
|000013b0| 69 6c 20 28 23 24 20 2e | 20 35 30 30 37 29 29 0a |il (#$ .| 5007)).|
|000013c0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|000013d0| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|000013e0| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|000013f0| 63 61 6c 20 65 64 69 66 | 66 2d 6d 65 74 61 2d 70 |cal edif|f-meta-p|
|00001400| 61 74 63 68 62 75 66 65 | 72 20 70 75 74 20 70 65 |atchbufe|r put pe|
|00001410| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00001420| 20 34 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 | 4).(def|alias 'e|
|00001430| 64 69 66 66 2d 67 65 74 | 2d 67 72 6f 75 70 2d 62 |diff-get|-group-b|
|00001440| 75 66 66 65 72 20 23 5b | 28 6d 65 74 61 2d 6c 69 |uffer #[|(meta-li|
|00001450| 73 74 29 20 22 08 40 40 | 87 22 20 5b 6d 65 74 61 |st) ".@@|." [meta|
|00001460| 2d 6c 69 73 74 5d 20 31 | 5d 29 0a 28 62 79 74 65 |-list] 1|]).(byte|
|00001470| 2d 63 6f 64 65 20 22 c0 | c1 4e c2 73 ac 85 c3 c4 |-code ".|.N.s....|
|00001480| c0 5c 22 88 c5 c0 c1 c6 | 23 87 22 20 5b 65 64 69 |.\".....|#." [edi|
|00001490| 66 66 2d 67 65 74 2d 67 | 72 6f 75 70 2d 62 75 66 |ff-get-g|roup-buf|
|000014a0| 66 65 72 20 62 79 74 65 | 2d 6f 70 74 69 6d 69 7a |fer byte|-optimiz|
|000014b0| 65 72 20 28 6e 69 6c 20 | 62 79 74 65 2d 63 6f 6d |er (nil |byte-com|
|000014c0| 70 69 6c 65 2d 69 6e 6c | 69 6e 65 2d 65 78 70 61 |pile-inl|ine-expa|
|000014d0| 6e 64 29 20 65 72 72 6f | 72 20 22 25 73 20 61 6c |nd) erro|r "%s al|
|000014e0| 72 65 61 64 79 20 68 61 | 73 20 61 20 62 79 74 65 |ready ha|s a byte|
|000014f0| 2d 6f 70 74 69 6d 69 7a | 65 72 2c 20 63 61 6e 27 |-optimiz|er, can'|
|00001500| 74 20 6d 61 6b 65 20 69 | 74 20 69 6e 6c 69 6e 65 |t make i|t inline|
|00001510| 22 20 70 75 74 20 62 79 | 74 65 2d 63 6f 6d 70 69 |" put by|te-compi|
|00001520| 6c 65 2d 69 6e 6c 69 6e | 65 2d 65 78 70 61 6e 64 |le-inlin|e-expand|
|00001530| 5d 20 34 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |] 4).(de|falias '|
|00001540| 65 64 69 66 66 2d 67 65 | 74 2d 67 72 6f 75 70 2d |ediff-ge|t-group-|
|00001550| 72 65 67 65 78 70 20 23 | 5b 28 6d 65 74 61 2d 6c |regexp #|[(meta-l|
|00001560| 69 73 74 29 20 22 08 40 | 41 40 87 22 20 5b 6d 65 |ist) ".@|A@." [me|
|00001570| 74 61 2d 6c 69 73 74 5d | 20 31 5d 29 0a 28 62 79 |ta-list]| 1]).(by|
|00001580| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 4e c2 73 ac 85 |te-code |"..N.s..|
|00001590| c3 c4 c0 5c 22 88 c5 c0 | c1 c6 23 87 22 20 5b 65 |...\"...|..#." [e|
|000015a0| 64 69 66 66 2d 67 65 74 | 2d 67 72 6f 75 70 2d 72 |diff-get|-group-r|
|000015b0| 65 67 65 78 70 20 62 79 | 74 65 2d 6f 70 74 69 6d |egexp by|te-optim|
|000015c0| 69 7a 65 72 20 28 6e 69 | 6c 20 62 79 74 65 2d 63 |izer (ni|l byte-c|
|000015d0| 6f 6d 70 69 6c 65 2d 69 | 6e 6c 69 6e 65 2d 65 78 |ompile-i|nline-ex|
|000015e0| 70 61 6e 64 29 20 65 72 | 72 6f 72 20 22 25 73 20 |pand) er|ror "%s |
|000015f0| 61 6c 72 65 61 64 79 20 | 68 61 73 20 61 20 62 79 |already |has a by|
|00001600| 74 65 2d 6f 70 74 69 6d | 69 7a 65 72 2c 20 63 61 |te-optim|izer, ca|
|00001610| 6e 27 74 20 6d 61 6b 65 | 20 69 74 20 69 6e 6c 69 |n't make| it inli|
|00001620| 6e 65 22 20 70 75 74 20 | 62 79 74 65 2d 63 6f 6d |ne" put |byte-com|
|00001630| 70 69 6c 65 2d 69 6e 6c | 69 6e 65 2d 65 78 70 61 |pile-inl|ine-expa|
|00001640| 6e 64 5d 20 34 29 0a 28 | 64 65 66 61 6c 69 61 73 |nd] 4).(|defalias|
|00001650| 20 27 65 64 69 66 66 2d | 67 65 74 2d 67 72 6f 75 | 'ediff-|get-grou|
|00001660| 70 2d 6f 62 6a 41 20 23 | 5b 28 6d 65 74 61 2d 6c |p-objA #|[(meta-l|
|00001670| 69 73 74 29 20 22 c0 09 | 40 38 87 22 20 5b 32 20 |ist) "..|@8." [2 |
|00001680| 6d 65 74 61 2d 6c 69 73 | 74 5d 20 32 5d 29 0a 28 |meta-lis|t] 2]).(|
|00001690| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 4e c2 73 |byte-cod|e "..N.s|
|000016a0| ac 85 c3 c4 c0 5c 22 88 | c5 c0 c1 c6 23 87 22 20 |.....\".|....#." |
|000016b0| 5b 65 64 69 66 66 2d 67 | 65 74 2d 67 72 6f 75 70 |[ediff-g|et-group|
|000016c0| 2d 6f 62 6a 41 20 62 79 | 74 65 2d 6f 70 74 69 6d |-objA by|te-optim|
|000016d0| 69 7a 65 72 20 28 6e 69 | 6c 20 62 79 74 65 2d 63 |izer (ni|l byte-c|
|000016e0| 6f 6d 70 69 6c 65 2d 69 | 6e 6c 69 6e 65 2d 65 78 |ompile-i|nline-ex|
|000016f0| 70 61 6e 64 29 20 65 72 | 72 6f 72 20 22 25 73 20 |pand) er|ror "%s |
|00001700| 61 6c 72 65 61 64 79 20 | 68 61 73 20 61 20 62 79 |already |has a by|
|00001710| 74 65 2d 6f 70 74 69 6d | 69 7a 65 72 2c 20 63 61 |te-optim|izer, ca|
|00001720| 6e 27 74 20 6d 61 6b 65 | 20 69 74 20 69 6e 6c 69 |n't make| it inli|
|00001730| 6e 65 22 20 70 75 74 20 | 62 79 74 65 2d 63 6f 6d |ne" put |byte-com|
|00001740| 70 69 6c 65 2d 69 6e 6c | 69 6e 65 2d 65 78 70 61 |pile-inl|ine-expa|
|00001750| 6e 64 5d 20 34 29 0a 28 | 64 65 66 61 6c 69 61 73 |nd] 4).(|defalias|
|00001760| 20 27 65 64 69 66 66 2d | 67 65 74 2d 67 72 6f 75 | 'ediff-|get-grou|
|00001770| 70 2d 6f 62 6a 42 20 23 | 5b 28 6d 65 74 61 2d 6c |p-objB #|[(meta-l|
|00001780| 69 73 74 29 20 22 c0 09 | 40 38 87 22 20 5b 33 20 |ist) "..|@8." [3 |
|00001790| 6d 65 74 61 2d 6c 69 73 | 74 5d 20 32 5d 29 0a 28 |meta-lis|t] 2]).(|
|000017a0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 4e c2 73 |byte-cod|e "..N.s|
|000017b0| ac 85 c3 c4 c0 5c 22 88 | c5 c0 c1 c6 23 87 22 20 |.....\".|....#." |
|000017c0| 5b 65 64 69 66 66 2d 67 | 65 74 2d 67 72 6f 75 70 |[ediff-g|et-group|
|000017d0| 2d 6f 62 6a 42 20 62 79 | 74 65 2d 6f 70 74 69 6d |-objB by|te-optim|
|000017e0| 69 7a 65 72 20 28 6e 69 | 6c 20 62 79 74 65 2d 63 |izer (ni|l byte-c|
|000017f0| 6f 6d 70 69 6c 65 2d 69 | 6e 6c 69 6e 65 2d 65 78 |ompile-i|nline-ex|
|00001800| 70 61 6e 64 29 20 65 72 | 72 6f 72 20 22 25 73 20 |pand) er|ror "%s |
|00001810| 61 6c 72 65 61 64 79 20 | 68 61 73 20 61 20 62 79 |already |has a by|
|00001820| 74 65 2d 6f 70 74 69 6d | 69 7a 65 72 2c 20 63 61 |te-optim|izer, ca|
|00001830| 6e 27 74 20 6d 61 6b 65 | 20 69 74 20 69 6e 6c 69 |n't make| it inli|
|00001840| 6e 65 22 20 70 75 74 20 | 62 79 74 65 2d 63 6f 6d |ne" put |byte-com|
|00001850| 70 69 6c 65 2d 69 6e 6c | 69 6e 65 2d 65 78 70 61 |pile-inl|ine-expa|
|00001860| 6e 64 5d 20 34 29 0a 28 | 64 65 66 61 6c 69 61 73 |nd] 4).(|defalias|
|00001870| 20 27 65 64 69 66 66 2d | 67 65 74 2d 67 72 6f 75 | 'ediff-|get-grou|
|00001880| 70 2d 6f 62 6a 43 20 23 | 5b 28 6d 65 74 61 2d 6c |p-objC #|[(meta-l|
|00001890| 69 73 74 29 20 22 c0 09 | 40 38 87 22 20 5b 34 20 |ist) "..|@8." [4 |
|000018a0| 6d 65 74 61 2d 6c 69 73 | 74 5d 20 32 5d 29 0a 28 |meta-lis|t] 2]).(|
|000018b0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 4e c2 73 |byte-cod|e "..N.s|
|000018c0| ac 85 c3 c4 c0 5c 22 88 | c5 c0 c1 c6 23 87 22 20 |.....\".|....#." |
|000018d0| 5b 65 64 69 66 66 2d 67 | 65 74 2d 67 72 6f 75 70 |[ediff-g|et-group|
|000018e0| 2d 6f 62 6a 43 20 62 79 | 74 65 2d 6f 70 74 69 6d |-objC by|te-optim|
|000018f0| 69 7a 65 72 20 28 6e 69 | 6c 20 62 79 74 65 2d 63 |izer (ni|l byte-c|
|00001900| 6f 6d 70 69 6c 65 2d 69 | 6e 6c 69 6e 65 2d 65 78 |ompile-i|nline-ex|
|00001910| 70 61 6e 64 29 20 65 72 | 72 6f 72 20 22 25 73 20 |pand) er|ror "%s |
|00001920| 61 6c 72 65 61 64 79 20 | 68 61 73 20 61 20 62 79 |already |has a by|
|00001930| 74 65 2d 6f 70 74 69 6d | 69 7a 65 72 2c 20 63 61 |te-optim|izer, ca|
|00001940| 6e 27 74 20 6d 61 6b 65 | 20 69 74 20 69 6e 6c 69 |n't make| it inli|
|00001950| 6e 65 22 20 70 75 74 20 | 62 79 74 65 2d 63 6f 6d |ne" put |byte-com|
|00001960| 70 69 6c 65 2d 69 6e 6c | 69 6e 65 2d 65 78 70 61 |pile-inl|ine-expa|
|00001970| 6e 64 5d 20 34 29 0a 28 | 64 65 66 61 6c 69 61 73 |nd] 4).(|defalias|
|00001980| 20 27 65 64 69 66 66 2d | 67 65 74 2d 67 72 6f 75 | 'ediff-|get-grou|
|00001990| 70 2d 6d 65 72 67 65 2d | 61 75 74 6f 73 74 6f 72 |p-merge-|autostor|
|000019a0| 65 2d 64 69 72 20 23 5b | 28 6d 65 74 61 2d 6c 69 |e-dir #[|(meta-li|
|000019b0| 73 74 29 20 22 c0 09 40 | 38 87 22 20 5b 35 20 6d |st) "..@|8." [5 m|
|000019c0| 65 74 61 2d 6c 69 73 74 | 5d 20 32 5d 29 0a 28 62 |eta-list|] 2]).(b|
|000019d0| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 4e c2 73 ac |yte-code| "..N.s.|
|000019e0| 85 c3 c4 c0 5c 22 88 c5 | c0 c1 c6 23 87 22 20 5b |....\"..|...#." [|
|000019f0| 65 64 69 66 66 2d 67 65 | 74 2d 67 72 6f 75 70 2d |ediff-ge|t-group-|
|00001a00| 6d 65 72 67 65 2d 61 75 | 74 6f 73 74 6f 72 65 2d |merge-au|tostore-|
|00001a10| 64 69 72 20 62 79 74 65 | 2d 6f 70 74 69 6d 69 7a |dir byte|-optimiz|
|00001a20| 65 72 20 28 6e 69 6c 20 | 62 79 74 65 2d 63 6f 6d |er (nil |byte-com|
|00001a30| 70 69 6c 65 2d 69 6e 6c | 69 6e 65 2d 65 78 70 61 |pile-inl|ine-expa|
|00001a40| 6e 64 29 20 65 72 72 6f | 72 20 22 25 73 20 61 6c |nd) erro|r "%s al|
|00001a50| 72 65 61 64 79 20 68 61 | 73 20 61 20 62 79 74 65 |ready ha|s a byte|
|00001a60| 2d 6f 70 74 69 6d 69 7a | 65 72 2c 20 63 61 6e 27 |-optimiz|er, can'|
|00001a70| 74 20 6d 61 6b 65 20 69 | 74 20 69 6e 6c 69 6e 65 |t make i|t inline|
|00001a80| 22 20 70 75 74 20 62 79 | 74 65 2d 63 6f 6d 70 69 |" put by|te-compi|
|00001a90| 6c 65 2d 69 6e 6c 69 6e | 65 2d 65 78 70 61 6e 64 |le-inlin|e-expand|
|00001aa0| 5d 20 34 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |] 4).(de|falias '|
|00001ab0| 65 64 69 66 66 2d 67 65 | 74 2d 73 65 73 73 69 6f |ediff-ge|t-sessio|
|00001ac0| 6e 2d 62 75 66 66 65 72 | 20 23 5b 28 65 6c 74 29 |n-buffer| #[(elt)|
|00001ad0| 20 22 08 40 87 22 20 5b | 65 6c 74 5d 20 31 5d 29 | ".@." [|elt] 1])|
|00001ae0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 4e |.(byte-c|ode "..N|
|00001af0| c2 73 ac 85 c3 c4 c0 5c | 22 88 c5 c0 c1 c6 23 87 |.s.....\|".....#.|
|00001b00| 22 20 5b 65 64 69 66 66 | 2d 67 65 74 2d 73 65 73 |" [ediff|-get-ses|
|00001b10| 73 69 6f 6e 2d 62 75 66 | 66 65 72 20 62 79 74 65 |sion-buf|fer byte|
|00001b20| 2d 6f 70 74 69 6d 69 7a | 65 72 20 28 6e 69 6c 20 |-optimiz|er (nil |
|00001b30| 62 79 74 65 2d 63 6f 6d | 70 69 6c 65 2d 69 6e 6c |byte-com|pile-inl|
|00001b40| 69 6e 65 2d 65 78 70 61 | 6e 64 29 20 65 72 72 6f |ine-expa|nd) erro|
|00001b50| 72 20 22 25 73 20 61 6c | 72 65 61 64 79 20 68 61 |r "%s al|ready ha|
|00001b60| 73 20 61 20 62 79 74 65 | 2d 6f 70 74 69 6d 69 7a |s a byte|-optimiz|
|00001b70| 65 72 2c 20 63 61 6e 27 | 74 20 6d 61 6b 65 20 69 |er, can'|t make i|
|00001b80| 74 20 69 6e 6c 69 6e 65 | 22 20 70 75 74 20 62 79 |t inline|" put by|
|00001b90| 74 65 2d 63 6f 6d 70 69 | 6c 65 2d 69 6e 6c 69 6e |te-compi|le-inlin|
|00001ba0| 65 2d 65 78 70 61 6e 64 | 5d 20 34 29 0a 28 64 65 |e-expand|] 4).(de|
|00001bb0| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 67 65 |falias '|ediff-ge|
|00001bc0| 74 2d 73 65 73 73 69 6f | 6e 2d 73 74 61 74 75 73 |t-sessio|n-status|
|00001bd0| 20 23 5b 28 65 6c 74 29 | 20 22 08 41 40 87 22 20 | #[(elt)| ".A@." |
|00001be0| 5b 65 6c 74 5d 20 31 5d | 29 0a 28 62 79 74 65 2d |[elt] 1]|).(byte-|
|00001bf0| 63 6f 64 65 20 22 c0 c1 | 4e c2 73 ac 85 c3 c4 c0 |code "..|N.s.....|
|00001c00| 5c 22 88 c5 c0 c1 c6 23 | 87 22 20 5b 65 64 69 66 |\".....#|." [edif|
|00001c10| 66 2d 67 65 74 2d 73 65 | 73 73 69 6f 6e 2d 73 74 |f-get-se|ssion-st|
|00001c20| 61 74 75 73 20 62 79 74 | 65 2d 6f 70 74 69 6d 69 |atus byt|e-optimi|
|00001c30| 7a 65 72 20 28 6e 69 6c | 20 62 79 74 65 2d 63 6f |zer (nil| byte-co|
|00001c40| 6d 70 69 6c 65 2d 69 6e | 6c 69 6e 65 2d 65 78 70 |mpile-in|line-exp|
|00001c50| 61 6e 64 29 20 65 72 72 | 6f 72 20 22 25 73 20 61 |and) err|or "%s a|
|00001c60| 6c 72 65 61 64 79 20 68 | 61 73 20 61 20 62 79 74 |lready h|as a byt|
|00001c70| 65 2d 6f 70 74 69 6d 69 | 7a 65 72 2c 20 63 61 6e |e-optimi|zer, can|
|00001c80| 27 74 20 6d 61 6b 65 20 | 69 74 20 69 6e 6c 69 6e |'t make |it inlin|
|00001c90| 65 22 20 70 75 74 20 62 | 79 74 65 2d 63 6f 6d 70 |e" put b|yte-comp|
|00001ca0| 69 6c 65 2d 69 6e 6c 69 | 6e 65 2d 65 78 70 61 6e |ile-inli|ne-expan|
|00001cb0| 64 5d 20 34 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |d] 4).(d|efalias |
|00001cc0| 27 65 64 69 66 66 2d 73 | 65 74 2d 73 65 73 73 69 |'ediff-s|et-sessi|
|00001cd0| 6f 6e 2d 73 74 61 74 75 | 73 20 23 5b 28 73 65 73 |on-statu|s #[(ses|
|00001ce0| 73 69 6f 6e 2d 69 6e 66 | 6f 20 6e 65 77 2d 73 74 |sion-inf|o new-st|
|00001cf0| 61 74 75 73 29 20 22 08 | 41 09 a0 87 22 20 5b 73 |atus) ".|A..." [s|
|00001d00| 65 73 73 69 6f 6e 2d 69 | 6e 66 6f 20 6e 65 77 2d |ession-i|nfo new-|
|00001d10| 73 74 61 74 75 73 5d 20 | 32 5d 29 0a 28 62 79 74 |status] |2]).(byt|
|00001d20| 65 2d 63 6f 64 65 20 22 | c0 c1 4e c2 73 ac 85 c3 |e-code "|..N.s...|
|00001d30| c4 c0 5c 22 88 c5 c0 c1 | c6 23 87 22 20 5b 65 64 |..\"....|.#." [ed|
|00001d40| 69 66 66 2d 73 65 74 2d | 73 65 73 73 69 6f 6e 2d |iff-set-|session-|
|00001d50| 73 74 61 74 75 73 20 62 | 79 74 65 2d 6f 70 74 69 |status b|yte-opti|
|00001d60| 6d 69 7a 65 72 20 28 6e | 69 6c 20 62 79 74 65 2d |mizer (n|il byte-|
|00001d70| 63 6f 6d 70 69 6c 65 2d | 69 6e 6c 69 6e 65 2d 65 |compile-|inline-e|
|00001d80| 78 70 61 6e 64 29 20 65 | 72 72 6f 72 20 22 25 73 |xpand) e|rror "%s|
|00001d90| 20 61 6c 72 65 61 64 79 | 20 68 61 73 20 61 20 62 | already| has a b|
|00001da0| 79 74 65 2d 6f 70 74 69 | 6d 69 7a 65 72 2c 20 63 |yte-opti|mizer, c|
|00001db0| 61 6e 27 74 20 6d 61 6b | 65 20 69 74 20 69 6e 6c |an't mak|e it inl|
|00001dc0| 69 6e 65 22 20 70 75 74 | 20 62 79 74 65 2d 63 6f |ine" put| byte-co|
|00001dd0| 6d 70 69 6c 65 2d 69 6e | 6c 69 6e 65 2d 65 78 70 |mpile-in|line-exp|
|00001de0| 61 6e 64 5d 20 34 29 0a | 28 64 65 66 61 6c 69 61 |and] 4).|(defalia|
|00001df0| 73 20 27 65 64 69 66 66 | 2d 67 65 74 2d 73 65 73 |s 'ediff|-get-ses|
|00001e00| 73 69 6f 6e 2d 6f 62 6a | 41 20 23 5b 28 65 6c 74 |sion-obj|A #[(elt|
|00001e10| 29 20 22 c0 09 38 87 22 | 20 5b 32 20 65 6c 74 5d |) "..8."| [2 elt]|
|00001e20| 20 32 5d 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 | 2]).(by|te-code |
|00001e30| 22 c0 c1 4e c2 73 ac 85 | c3 c4 c0 5c 22 88 c5 c0 |"..N.s..|...\"...|
|00001e40| c1 c6 23 87 22 20 5b 65 | 64 69 66 66 2d 67 65 74 |..#." [e|diff-get|
|00001e50| 2d 73 65 73 73 69 6f 6e | 2d 6f 62 6a 41 20 62 79 |-session|-objA by|
|00001e60| 74 65 2d 6f 70 74 69 6d | 69 7a 65 72 20 28 6e 69 |te-optim|izer (ni|
|00001e70| 6c 20 62 79 74 65 2d 63 | 6f 6d 70 69 6c 65 2d 69 |l byte-c|ompile-i|
|00001e80| 6e 6c 69 6e 65 2d 65 78 | 70 61 6e 64 29 20 65 72 |nline-ex|pand) er|
|00001e90| 72 6f 72 20 22 25 73 20 | 61 6c 72 65 61 64 79 20 |ror "%s |already |
|00001ea0| 68 61 73 20 61 20 62 79 | 74 65 2d 6f 70 74 69 6d |has a by|te-optim|
|00001eb0| 69 7a 65 72 2c 20 63 61 | 6e 27 74 20 6d 61 6b 65 |izer, ca|n't make|
|00001ec0| 20 69 74 20 69 6e 6c 69 | 6e 65 22 20 70 75 74 20 | it inli|ne" put |
|00001ed0| 62 79 74 65 2d 63 6f 6d | 70 69 6c 65 2d 69 6e 6c |byte-com|pile-inl|
|00001ee0| 69 6e 65 2d 65 78 70 61 | 6e 64 5d 20 34 29 0a 28 |ine-expa|nd] 4).(|
|00001ef0| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00001f00| 67 65 74 2d 73 65 73 73 | 69 6f 6e 2d 6f 62 6a 42 |get-sess|ion-objB|
|00001f10| 20 23 5b 28 65 6c 74 29 | 20 22 c0 09 38 87 22 20 | #[(elt)| "..8." |
|00001f20| 5b 33 20 65 6c 74 5d 20 | 32 5d 29 0a 28 62 79 74 |[3 elt] |2]).(byt|
|00001f30| 65 2d 63 6f 64 65 20 22 | c0 c1 4e c2 73 ac 85 c3 |e-code "|..N.s...|
|00001f40| c4 c0 5c 22 88 c5 c0 c1 | c6 23 87 22 20 5b 65 64 |..\"....|.#." [ed|
|00001f50| 69 66 66 2d 67 65 74 2d | 73 65 73 73 69 6f 6e 2d |iff-get-|session-|
|00001f60| 6f 62 6a 42 20 62 79 74 | 65 2d 6f 70 74 69 6d 69 |objB byt|e-optimi|
|00001f70| 7a 65 72 20 28 6e 69 6c | 20 62 79 74 65 2d 63 6f |zer (nil| byte-co|
|00001f80| 6d 70 69 6c 65 2d 69 6e | 6c 69 6e 65 2d 65 78 70 |mpile-in|line-exp|
|00001f90| 61 6e 64 29 20 65 72 72 | 6f 72 20 22 25 73 20 61 |and) err|or "%s a|
|00001fa0| 6c 72 65 61 64 79 20 68 | 61 73 20 61 20 62 79 74 |lready h|as a byt|
|00001fb0| 65 2d 6f 70 74 69 6d 69 | 7a 65 72 2c 20 63 61 6e |e-optimi|zer, can|
|00001fc0| 27 74 20 6d 61 6b 65 20 | 69 74 20 69 6e 6c 69 6e |'t make |it inlin|
|00001fd0| 65 22 20 70 75 74 20 62 | 79 74 65 2d 63 6f 6d 70 |e" put b|yte-comp|
|00001fe0| 69 6c 65 2d 69 6e 6c 69 | 6e 65 2d 65 78 70 61 6e |ile-inli|ne-expan|
|00001ff0| 64 5d 20 34 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |d] 4).(d|efalias |
|00002000| 27 65 64 69 66 66 2d 67 | 65 74 2d 73 65 73 73 69 |'ediff-g|et-sessi|
|00002010| 6f 6e 2d 6f 62 6a 43 20 | 23 5b 28 65 6c 74 29 20 |on-objC |#[(elt) |
|00002020| 22 c0 09 38 87 22 20 5b | 34 20 65 6c 74 5d 20 32 |"..8." [|4 elt] 2|
|00002030| 5d 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |]).(byte|-code ".|
|00002040| c1 4e c2 73 ac 85 c3 c4 | c0 5c 22 88 c5 c0 c1 c6 |.N.s....|.\".....|
|00002050| 23 87 22 20 5b 65 64 69 | 66 66 2d 67 65 74 2d 73 |#." [edi|ff-get-s|
|00002060| 65 73 73 69 6f 6e 2d 6f | 62 6a 43 20 62 79 74 65 |ession-o|bjC byte|
|00002070| 2d 6f 70 74 69 6d 69 7a | 65 72 20 28 6e 69 6c 20 |-optimiz|er (nil |
|00002080| 62 79 74 65 2d 63 6f 6d | 70 69 6c 65 2d 69 6e 6c |byte-com|pile-inl|
|00002090| 69 6e 65 2d 65 78 70 61 | 6e 64 29 20 65 72 72 6f |ine-expa|nd) erro|
|000020a0| 72 20 22 25 73 20 61 6c | 72 65 61 64 79 20 68 61 |r "%s al|ready ha|
|000020b0| 73 20 61 20 62 79 74 65 | 2d 6f 70 74 69 6d 69 7a |s a byte|-optimiz|
|000020c0| 65 72 2c 20 63 61 6e 27 | 74 20 6d 61 6b 65 20 69 |er, can'|t make i|
|000020d0| 74 20 69 6e 6c 69 6e 65 | 22 20 70 75 74 20 62 79 |t inline|" put by|
|000020e0| 74 65 2d 63 6f 6d 70 69 | 6c 65 2d 69 6e 6c 69 6e |te-compi|le-inlin|
|000020f0| 65 2d 65 78 70 61 6e 64 | 5d 20 34 29 0a 28 64 65 |e-expand|] 4).(de|
|00002100| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 67 65 |falias '|ediff-ge|
|00002110| 74 2d 73 65 73 73 69 6f | 6e 2d 6f 62 6a 41 2d 6e |t-sessio|n-objA-n|
|00002120| 61 6d 65 20 23 5b 28 65 | 6c 74 29 20 22 c0 09 38 |ame #[(e|lt) "..8|
|00002130| 40 87 22 20 5b 32 20 65 | 6c 74 5d 20 32 5d 29 0a |@." [2 e|lt] 2]).|
|00002140| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 4e c2 |(byte-co|de "..N.|
|00002150| 73 ac 85 c3 c4 c0 5c 22 | 88 c5 c0 c1 c6 23 87 22 |s.....\"|.....#."|
|00002160| 20 5b 65 64 69 66 66 2d | 67 65 74 2d 73 65 73 73 | [ediff-|get-sess|
|00002170| 69 6f 6e 2d 6f 62 6a 41 | 2d 6e 61 6d 65 20 62 79 |ion-objA|-name by|
|00002180| 74 65 2d 6f 70 74 69 6d | 69 7a 65 72 20 28 6e 69 |te-optim|izer (ni|
|00002190| 6c 20 62 79 74 65 2d 63 | 6f 6d 70 69 6c 65 2d 69 |l byte-c|ompile-i|
|000021a0| 6e 6c 69 6e 65 2d 65 78 | 70 61 6e 64 29 20 65 72 |nline-ex|pand) er|
|000021b0| 72 6f 72 20 22 25 73 20 | 61 6c 72 65 61 64 79 20 |ror "%s |already |
|000021c0| 68 61 73 20 61 20 62 79 | 74 65 2d 6f 70 74 69 6d |has a by|te-optim|
|000021d0| 69 7a 65 72 2c 20 63 61 | 6e 27 74 20 6d 61 6b 65 |izer, ca|n't make|
|000021e0| 20 69 74 20 69 6e 6c 69 | 6e 65 22 20 70 75 74 20 | it inli|ne" put |
|000021f0| 62 79 74 65 2d 63 6f 6d | 70 69 6c 65 2d 69 6e 6c |byte-com|pile-inl|
|00002200| 69 6e 65 2d 65 78 70 61 | 6e 64 5d 20 34 29 0a 28 |ine-expa|nd] 4).(|
|00002210| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00002220| 67 65 74 2d 73 65 73 73 | 69 6f 6e 2d 6f 62 6a 42 |get-sess|ion-objB|
|00002230| 2d 6e 61 6d 65 20 23 5b | 28 65 6c 74 29 20 22 c0 |-name #[|(elt) ".|
|00002240| 09 38 40 87 22 20 5b 33 | 20 65 6c 74 5d 20 32 5d |.8@." [3| elt] 2]|
|00002250| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00002260| 4e c2 73 ac 85 c3 c4 c0 | 5c 22 88 c5 c0 c1 c6 23 |N.s.....|\".....#|
|00002270| 87 22 20 5b 65 64 69 66 | 66 2d 67 65 74 2d 73 65 |." [edif|f-get-se|
|00002280| 73 73 69 6f 6e 2d 6f 62 | 6a 42 2d 6e 61 6d 65 20 |ssion-ob|jB-name |
|00002290| 62 79 74 65 2d 6f 70 74 | 69 6d 69 7a 65 72 20 28 |byte-opt|imizer (|
|000022a0| 6e 69 6c 20 62 79 74 65 | 2d 63 6f 6d 70 69 6c 65 |nil byte|-compile|
|000022b0| 2d 69 6e 6c 69 6e 65 2d | 65 78 70 61 6e 64 29 20 |-inline-|expand) |
|000022c0| 65 72 72 6f 72 20 22 25 | 73 20 61 6c 72 65 61 64 |error "%|s alread|
|000022d0| 79 20 68 61 73 20 61 20 | 62 79 74 65 2d 6f 70 74 |y has a |byte-opt|
|000022e0| 69 6d 69 7a 65 72 2c 20 | 63 61 6e 27 74 20 6d 61 |imizer, |can't ma|
|000022f0| 6b 65 20 69 74 20 69 6e | 6c 69 6e 65 22 20 70 75 |ke it in|line" pu|
|00002300| 74 20 62 79 74 65 2d 63 | 6f 6d 70 69 6c 65 2d 69 |t byte-c|ompile-i|
|00002310| 6e 6c 69 6e 65 2d 65 78 | 70 61 6e 64 5d 20 34 29 |nline-ex|pand] 4)|
|00002320| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00002330| 66 2d 67 65 74 2d 73 65 | 73 73 69 6f 6e 2d 6f 62 |f-get-se|ssion-ob|
|00002340| 6a 43 2d 6e 61 6d 65 20 | 23 5b 28 65 6c 74 29 20 |jC-name |#[(elt) |
|00002350| 22 c0 09 38 40 87 22 20 | 5b 34 20 65 6c 74 5d 20 |"..8@." |[4 elt] |
|00002360| 32 5d 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |2]).(byt|e-code "|
|00002370| c0 c1 4e c2 73 ac 85 c3 | c4 c0 5c 22 88 c5 c0 c1 |..N.s...|..\"....|
|00002380| c6 23 87 22 20 5b 65 64 | 69 66 66 2d 67 65 74 2d |.#." [ed|iff-get-|
|00002390| 73 65 73 73 69 6f 6e 2d | 6f 62 6a 43 2d 6e 61 6d |session-|objC-nam|
|000023a0| 65 20 62 79 74 65 2d 6f | 70 74 69 6d 69 7a 65 72 |e byte-o|ptimizer|
|000023b0| 20 28 6e 69 6c 20 62 79 | 74 65 2d 63 6f 6d 70 69 | (nil by|te-compi|
|000023c0| 6c 65 2d 69 6e 6c 69 6e | 65 2d 65 78 70 61 6e 64 |le-inlin|e-expand|
|000023d0| 29 20 65 72 72 6f 72 20 | 22 25 73 20 61 6c 72 65 |) error |"%s alre|
|000023e0| 61 64 79 20 68 61 73 20 | 61 20 62 79 74 65 2d 6f |ady has |a byte-o|
|000023f0| 70 74 69 6d 69 7a 65 72 | 2c 20 63 61 6e 27 74 20 |ptimizer|, can't |
|00002400| 6d 61 6b 65 20 69 74 20 | 69 6e 6c 69 6e 65 22 20 |make it |inline" |
|00002410| 70 75 74 20 62 79 74 65 | 2d 63 6f 6d 70 69 6c 65 |put byte|-compile|
|00002420| 2d 69 6e 6c 69 6e 65 2d | 65 78 70 61 6e 64 5d 20 |-inline-|expand] |
|00002430| 34 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |4).(defa|lias 'ed|
|00002440| 69 66 66 2d 67 65 74 2d | 66 69 6c 65 2d 65 71 73 |iff-get-|file-eqs|
|00002450| 74 61 74 75 73 20 23 5b | 28 65 6c 74 29 20 22 08 |tatus #[|(elt) ".|
|00002460| 41 40 87 22 20 5b 65 6c | 74 5d 20 31 5d 29 0a 28 |A@." [el|t] 1]).(|
|00002470| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 4e c2 73 |byte-cod|e "..N.s|
|00002480| ac 85 c3 c4 c0 5c 22 88 | c5 c0 c1 c6 23 87 22 20 |.....\".|....#." |
|00002490| 5b 65 64 69 66 66 2d 67 | 65 74 2d 66 69 6c 65 2d |[ediff-g|et-file-|
|000024a0| 65 71 73 74 61 74 75 73 | 20 62 79 74 65 2d 6f 70 |eqstatus| byte-op|
|000024b0| 74 69 6d 69 7a 65 72 20 | 28 6e 69 6c 20 62 79 74 |timizer |(nil byt|
|000024c0| 65 2d 63 6f 6d 70 69 6c | 65 2d 69 6e 6c 69 6e 65 |e-compil|e-inline|
|000024d0| 2d 65 78 70 61 6e 64 29 | 20 65 72 72 6f 72 20 22 |-expand)| error "|
|000024e0| 25 73 20 61 6c 72 65 61 | 64 79 20 68 61 73 20 61 |%s alrea|dy has a|
|000024f0| 20 62 79 74 65 2d 6f 70 | 74 69 6d 69 7a 65 72 2c | byte-op|timizer,|
|00002500| 20 63 61 6e 27 74 20 6d | 61 6b 65 20 69 74 20 69 | can't m|ake it i|
|00002510| 6e 6c 69 6e 65 22 20 70 | 75 74 20 62 79 74 65 2d |nline" p|ut byte-|
|00002520| 63 6f 6d 70 69 6c 65 2d | 69 6e 6c 69 6e 65 2d 65 |compile-|inline-e|
|00002530| 78 70 61 6e 64 5d 20 34 | 29 0a 28 64 65 66 61 6c |xpand] 4|).(defal|
|00002540| 69 61 73 20 27 65 64 69 | 66 66 2d 73 65 74 2d 66 |ias 'edi|ff-set-f|
|00002550| 69 6c 65 2d 65 71 73 74 | 61 74 75 73 20 23 5b 28 |ile-eqst|atus #[(|
|00002560| 65 6c 74 20 76 61 6c 75 | 65 29 20 22 08 41 09 a0 |elt valu|e) ".A..|
|00002570| 87 22 20 5b 65 6c 74 20 | 76 61 6c 75 65 5d 20 32 |." [elt |value] 2|
|00002580| 5d 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |]).(byte|-code ".|
|00002590| c1 4e c2 73 ac 85 c3 c4 | c0 5c 22 88 c5 c0 c1 c6 |.N.s....|.\".....|
|000025a0| 23 87 22 20 5b 65 64 69 | 66 66 2d 73 65 74 2d 66 |#." [edi|ff-set-f|
|000025b0| 69 6c 65 2d 65 71 73 74 | 61 74 75 73 20 62 79 74 |ile-eqst|atus byt|
|000025c0| 65 2d 6f 70 74 69 6d 69 | 7a 65 72 20 28 6e 69 6c |e-optimi|zer (nil|
|000025d0| 20 62 79 74 65 2d 63 6f | 6d 70 69 6c 65 2d 69 6e | byte-co|mpile-in|
|000025e0| 6c 69 6e 65 2d 65 78 70 | 61 6e 64 29 20 65 72 72 |line-exp|and) err|
|000025f0| 6f 72 20 22 25 73 20 61 | 6c 72 65 61 64 79 20 68 |or "%s a|lready h|
|00002600| 61 73 20 61 20 62 79 74 | 65 2d 6f 70 74 69 6d 69 |as a byt|e-optimi|
|00002610| 7a 65 72 2c 20 63 61 6e | 27 74 20 6d 61 6b 65 20 |zer, can|'t make |
|00002620| 69 74 20 69 6e 6c 69 6e | 65 22 20 70 75 74 20 62 |it inlin|e" put b|
|00002630| 79 74 65 2d 63 6f 6d 70 | 69 6c 65 2d 69 6e 6c 69 |yte-comp|ile-inli|
|00002640| 6e 65 2d 65 78 70 61 6e | 64 5d 20 34 29 0a 28 64 |ne-expan|d] 4).(d|
|00002650| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 67 |efalias |'ediff-g|
|00002660| 65 74 2d 73 65 73 73 69 | 6f 6e 2d 61 63 74 69 76 |et-sessi|on-activ|
|00002670| 69 74 79 2d 6d 61 72 6b | 65 72 20 23 5b 28 73 65 |ity-mark|er #[(se|
|00002680| 73 73 69 6f 6e 29 20 22 | 08 89 19 40 29 89 1a ac |ssion) "|...@)...|
|00002690| 83 c3 aa 93 5c 6e ab 8f | c4 5c 6e 21 ab 8a c5 c4 |....\n..|.\n!....|
|000026a0| 5c 6e 21 21 ab 83 c6 aa | 81 c7 29 87 22 20 5b 73 |\n!!....|..)." [s|
|000026b0| 65 73 73 69 6f 6e 20 65 | 6c 74 20 73 65 73 73 69 |ession e|lt sessi|
|000026c0| 6f 6e 2d 62 75 66 20 6e | 69 6c 20 67 65 74 2d 62 |on-buf n|il get-b|
|000026d0| 75 66 66 65 72 20 62 75 | 66 66 65 72 2d 6e 61 6d |uffer bu|ffer-nam|
|000026e0| 65 20 3f 5c 2b 20 3f 5c | 2d 5d 20 34 5d 29 0a 28 |e ?\+ ?\|-] 4]).(|
|000026f0| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00002700| 6d 65 74 61 2d 73 65 73 | 73 69 6f 6e 2d 70 20 23 |meta-ses|sion-p #|
|00002710| 5b 28 73 65 73 73 69 6f | 6e 2d 69 6e 66 6f 29 20 |[(sessio|n-info) |
|00002720| 22 08 19 c2 09 38 40 29 | 3b ad b5 c3 08 19 c2 09 |"....8@)|;.......|
|00002730| 38 40 29 21 ad aa 08 19 | c4 09 38 40 29 3b ad a0 |8@)!....|..8@);..|
|00002740| c3 08 19 c4 09 38 40 29 | 21 ad 95 08 19 c5 09 38 |.....8@)|!......8|
|00002750| 40 29 3b ab 8a c3 08 19 | c5 09 38 40 29 21 87 c6 |@);.....|..8@)!..|
|00002760| 87 22 20 5b 73 65 73 73 | 69 6f 6e 2d 69 6e 66 6f |." [sess|ion-info|
|00002770| 20 65 6c 74 20 32 20 66 | 69 6c 65 2d 64 69 72 65 | elt 2 f|ile-dire|
|00002780| 63 74 6f 72 79 2d 70 20 | 33 20 34 20 74 5d 20 33 |ctory-p |3 4 t] 3|
|00002790| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|000027a0| 69 66 66 2d 73 65 74 75 | 70 2d 6d 65 74 61 2d 6d |iff-setu|p-meta-m|
|000027b0| 61 70 20 23 5b 6e 69 6c | 20 22 c0 20 11 c2 09 21 |ap #[nil| ". ...!|
|000027c0| 88 c3 09 c4 c5 23 88 c3 | 09 c6 c7 23 88 c3 09 c8 |.....#..|...#....|
|000027d0| c9 23 88 c3 09 ca cb 23 | 88 c3 09 cc 0e 0d 23 88 |.#.....#|......#.|
|000027e0| c3 09 ce 0e 0d 23 88 c3 | 09 cf d0 23 88 c3 09 d1 |.....#..|...#....|
|000027f0| d0 23 88 c3 09 d2 d3 23 | 88 c3 09 d4 d3 23 88 c3 |.#.....#|.....#..|
|00002800| 09 d5 d3 23 88 c3 09 d6 | d3 23 88 d7 20 ac 86 c3 |...#....|.#.. ...|
|00002810| 09 d8 d9 23 88 0e 1a ab | 86 c3 09 db d3 23 88 0e |...#....|.....#..|
|00002820| 1c ab 89 c3 09 dd 0e 0d | 23 88 aa 87 c3 09 de 0e |........|#.......|
|00002830| 0d 23 88 df 09 21 88 e0 | e1 21 87 22 20 5b 6d 61 |.#...!..|.!." [ma|
|00002840| 6b 65 2d 73 70 61 72 73 | 65 2d 6b 65 79 6d 61 70 |ke-spars|e-keymap|
|00002850| 20 65 64 69 66 66 2d 6d | 65 74 61 2d 62 75 66 66 | ediff-m|eta-buff|
|00002860| 65 72 2d 6d 61 70 20 73 | 75 70 70 72 65 73 73 2d |er-map s|uppress-|
|00002870| 6b 65 79 6d 61 70 20 64 | 65 66 69 6e 65 2d 6b 65 |keymap d|efine-ke|
|00002880| 79 20 22 71 22 20 65 64 | 69 66 66 2d 71 75 69 74 |y "q" ed|iff-quit|
|00002890| 2d 6d 65 74 61 2d 62 75 | 66 66 65 72 20 22 54 22 |-meta-bu|ffer "T"|
|000028a0| 20 65 64 69 66 66 2d 74 | 6f 67 67 6c 65 2d 66 69 | ediff-t|oggle-fi|
|000028b0| 6c 65 6e 61 6d 65 2d 74 | 72 75 6e 63 61 74 69 6f |lename-t|runcatio|
|000028c0| 6e 20 22 52 22 20 65 64 | 69 66 66 2d 73 68 6f 77 |n "R" ed|iff-show|
|000028d0| 2d 72 65 67 69 73 74 72 | 79 20 22 45 22 20 65 64 |-registr|y "E" ed|
|000028e0| 69 66 66 2d 64 6f 63 75 | 6d 65 6e 74 61 74 69 6f |iff-docu|mentatio|
|000028f0| 6e 20 22 76 22 20 65 64 | 69 66 66 2d 6d 65 74 61 |n "v" ed|iff-meta|
|00002900| 2d 61 63 74 69 6f 6e 2d | 66 75 6e 63 74 69 6f 6e |-action-|function|
|00002910| 20 22 0d 22 20 22 20 22 | 20 65 64 69 66 66 2d 6e | "." " "| ediff-n|
|00002920| 65 78 74 2d 6d 65 74 61 | 2d 69 74 65 6d 20 22 6e |ext-meta|-item "n|
|00002930| 22 20 22 7f 22 20 65 64 | 69 66 66 2d 70 72 65 76 |" "." ed|iff-prev|
|00002940| 69 6f 75 73 2d 6d 65 74 | 61 2d 69 74 65 6d 20 22 |ious-met|a-item "|
|00002950| 70 22 20 5b 64 65 6c 65 | 74 65 5d 20 5b 62 61 63 |p" [dele|te] [bac|
|00002960| 6b 73 70 61 63 65 5d 20 | 65 64 69 66 66 2d 6f 6e |kspace] |ediff-on|
|00002970| 65 2d 66 69 6c 65 67 72 | 6f 75 70 2d 6d 65 74 61 |e-filegr|oup-meta|
|00002980| 6a 6f 62 20 22 3d 22 20 | 65 64 69 66 66 2d 6d 65 |job "=" |ediff-me|
|00002990| 74 61 2d 6d 61 72 6b 2d | 65 71 75 61 6c 2d 66 69 |ta-mark-|equal-fi|
|000029a0| 6c 65 73 20 65 64 69 66 | 66 2d 6e 6f 2d 65 6d 61 |les edif|f-no-ema|
|000029b0| 63 73 2d 68 65 6c 70 2d | 69 6e 2d 63 6f 6e 74 72 |cs-help-|in-contr|
|000029c0| 6f 6c 2d 62 75 66 66 65 | 72 20 22 08 22 20 65 64 |ol-buffe|r "." ed|
|000029d0| 69 66 66 2d 65 6d 61 63 | 73 2d 70 20 5b 6d 6f 75 |iff-emac|s-p [mou|
|000029e0| 73 65 2d 32 5d 20 5b 62 | 75 74 74 6f 6e 32 5d 20 |se-2] [b|utton2] |
|000029f0| 75 73 65 2d 6c 6f 63 61 | 6c 2d 6d 61 70 20 72 75 |use-loca|l-map ru|
|00002a00| 6e 2d 68 6f 6f 6b 73 20 | 65 64 69 66 66 2d 6d 65 |n-hooks |ediff-me|
|00002a10| 74 61 2d 62 75 66 66 65 | 72 2d 6b 65 79 6d 61 70 |ta-buffe|r-keymap|
|00002a20| 2d 73 65 74 75 70 2d 68 | 6f 6f 6b 5d 20 34 5d 29 |-setup-h|ook] 4])|
|00002a30| 0a 23 40 35 31 36 20 54 | 68 69 73 20 6d 6f 64 65 |.#@516 T|his mode|
|00002a40| 20 63 6f 6e 74 72 6f 6c | 73 20 61 6c 6c 20 6f 70 | control|s all op|
|00002a50| 65 72 61 74 69 6f 6e 73 | 20 6f 6e 20 45 64 69 66 |erations| on Edif|
|00002a60| 66 20 73 65 73 73 69 6f | 6e 20 67 72 6f 75 70 73 |f sessio|n groups|
|00002a70| 2e 0a 49 74 20 69 73 20 | 65 6e 74 65 72 65 64 20 |..It is |entered |
|00002a80| 74 68 72 6f 75 67 68 20 | 6f 6e 65 20 6f 66 20 74 |through |one of t|
|00002a90| 68 65 20 66 6f 6c 6c 6f | 77 69 6e 67 20 63 6f 6d |he follo|wing com|
|00002aa0| 6d 61 6e 64 73 3a 0a 09 | 60 65 64 69 66 66 2d 64 |mands:..|`ediff-d|
|00002ab0| 69 72 65 63 74 6f 72 69 | 65 73 27 0a 09 60 65 64 |irectori|es'..`ed|
|00002ac0| 69 72 73 27 0a 09 60 65 | 64 69 66 66 2d 64 69 72 |irs'..`e|diff-dir|
|00002ad0| 65 63 74 6f 72 69 65 73 | 33 27 0a 09 60 65 64 69 |ectories|3'..`edi|
|00002ae0| 72 73 33 27 0a 09 60 65 | 64 69 66 66 2d 6d 65 72 |rs3'..`e|diff-mer|
|00002af0| 67 65 2d 64 69 72 65 63 | 74 6f 72 69 65 73 27 0a |ge-direc|tories'.|
|00002b00| 09 60 65 64 69 72 73 2d | 6d 65 72 67 65 27 0a 09 |.`edirs-|merge'..|
|00002b10| 60 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 |`ediff-m|erge-dir|
|00002b20| 65 63 74 6f 72 69 65 73 | 2d 77 69 74 68 2d 61 6e |ectories|-with-an|
|00002b30| 63 65 73 74 6f 72 27 0a | 09 60 65 64 69 72 73 2d |cestor'.|.`edirs-|
|00002b40| 6d 65 72 67 65 2d 77 69 | 74 68 2d 61 6e 63 65 73 |merge-wi|th-ances|
|00002b50| 74 6f 72 27 0a 09 60 65 | 64 69 66 66 2d 64 69 72 |tor'..`e|diff-dir|
|00002b60| 65 63 74 6f 72 79 2d 72 | 65 76 69 73 69 6f 6e 73 |ectory-r|evisions|
|00002b70| 27 0a 09 60 65 64 69 72 | 2d 72 65 76 69 73 69 6f |'..`edir|-revisio|
|00002b80| 6e 73 27 0a 09 60 65 64 | 69 66 66 2d 6d 65 72 67 |ns'..`ed|iff-merg|
|00002b90| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |e-direct|ory-revi|
|00002ba0| 73 69 6f 6e 73 27 0a 09 | 60 65 64 69 72 2d 6d 65 |sions'..|`edir-me|
|00002bb0| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 27 0a 09 |rge-revi|sions'..|
|00002bc0| 60 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 |`ediff-m|erge-dir|
|00002bd0| 65 63 74 6f 72 79 2d 72 | 65 76 69 73 69 6f 6e 73 |ectory-r|evisions|
|00002be0| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 27 0a |-with-an|cestor'.|
|00002bf0| 09 60 65 64 69 72 2d 6d | 65 72 67 65 2d 72 65 76 |.`edir-m|erge-rev|
|00002c00| 69 73 69 6f 6e 73 2d 77 | 69 74 68 2d 61 6e 63 65 |isions-w|ith-ance|
|00002c10| 73 74 6f 72 27 0a 0a 43 | 6f 6d 6d 61 6e 64 73 3a |stor'..C|ommands:|
|00002c20| 0a 5c 7b 65 64 69 66 66 | 2d 6d 65 74 61 2d 62 75 |.\{ediff|-meta-bu|
|00002c30| 66 66 65 72 2d 6d 61 70 | 7d 1f 0a 28 64 65 66 61 |ffer-map|}..(defa|
|00002c40| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 6d 65 74 61 |lias 'ed|iff-meta|
|00002c50| 2d 6d 6f 64 65 20 23 5b | 6e 69 6c 20 22 c0 20 88 |-mode #[|nil ". .|
|00002c60| c1 12 c3 89 14 87 22 20 | 5b 6b 69 6c 6c 2d 61 6c |......" |[kill-al|
|00002c70| 6c 2d 6c 6f 63 61 6c 2d | 76 61 72 69 61 62 6c 65 |l-local-|variable|
|00002c80| 73 20 65 64 69 66 66 2d | 6d 65 74 61 2d 6d 6f 64 |s ediff-|meta-mod|
|00002c90| 65 20 6d 61 6a 6f 72 2d | 6d 6f 64 65 20 22 4d 65 |e major-|mode "Me|
|00002ca0| 74 61 45 64 69 66 66 22 | 20 6d 6f 64 65 2d 6e 61 |taEdiff"| mode-na|
|00002cb0| 6d 65 5d 20 32 20 28 23 | 24 20 2e 20 31 30 38 30 |me] 2 (#|$ . 1080|
|00002cc0| 37 29 5d 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |7)]).(by|te-code |
|00002cd0| 22 c0 09 21 88 c2 09 c3 | c4 23 88 c2 09 c5 c6 23 |"..!....|.#.....#|
|00002ce0| 88 c2 09 c7 c6 23 88 c2 | 09 c8 c9 23 88 c2 09 ca |.....#..|...#....|
|00002cf0| c9 23 88 c2 09 cb c9 23 | 88 c2 09 cc c9 23 87 22 |.#.....#|.....#."|
|00002d00| 20 5b 73 75 70 70 72 65 | 73 73 2d 6b 65 79 6d 61 | [suppre|ss-keyma|
|00002d10| 70 20 65 64 69 66 66 2d | 64 69 72 2d 64 69 66 66 |p ediff-|dir-diff|
|00002d20| 73 2d 62 75 66 66 65 72 | 2d 6d 61 70 20 64 65 66 |s-buffer|-map def|
|00002d30| 69 6e 65 2d 6b 65 79 20 | 22 71 22 20 65 64 69 66 |ine-key |"q" edif|
|00002d40| 66 2d 62 75 72 79 2d 64 | 69 72 2d 64 69 66 66 73 |f-bury-d|ir-diffs|
|00002d50| 2d 62 75 66 66 65 72 20 | 22 20 22 20 6e 65 78 74 |-buffer |" " next|
|00002d60| 2d 6c 69 6e 65 20 22 6e | 22 20 22 7f 22 20 70 72 |-line "n|" "." pr|
|00002d70| 65 76 69 6f 75 73 2d 6c | 69 6e 65 20 22 70 22 20 |evious-l|ine "p" |
|00002d80| 5b 64 65 6c 65 74 65 5d | 20 5b 62 61 63 6b 73 70 |[delete]| [backsp|
|00002d90| 61 63 65 5d 5d 20 34 29 | 0a 23 40 31 34 30 20 4d |ace]] 4)|.#@140 M|
|00002da0| 6f 76 65 20 74 6f 20 74 | 68 65 20 6e 65 78 74 20 |ove to t|he next |
|00002db0| 69 74 65 6d 20 69 6e 20 | 45 64 69 66 66 20 72 65 |item in |Ediff re|
|00002dc0| 67 69 73 74 72 79 20 6f | 72 20 73 65 73 73 69 6f |gistry o|r sessio|
|00002dd0| 6e 20 67 72 6f 75 70 20 | 62 75 66 66 65 72 2e 0a |n group |buffer..|
|00002de0| 4d 6f 76 65 73 20 69 6e | 20 63 69 72 63 75 6c 61 |Moves in| circula|
|00002df0| 72 20 66 61 73 68 69 6f | 6e 2e 20 57 69 74 68 20 |r fashio|n. With |
|00002e00| 6e 75 6d 65 72 69 63 20 | 70 72 65 66 69 78 20 61 |numeric |prefix a|
|00002e10| 72 67 2c 20 73 6b 69 70 | 20 74 68 69 73 20 6d 61 |rg, skip| this ma|
|00002e20| 6e 79 20 69 74 65 6d 73 | 2e 1f 0a 28 64 65 66 61 |ny items|...(defa|
|00002e30| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 6e 65 78 74 |lias 'ed|iff-next|
|00002e40| 2d 6d 65 74 61 2d 69 74 | 65 6d 20 23 5b 28 63 6f |-meta-it|em #[(co|
|00002e50| 75 6e 74 29 20 22 08 ac | 82 c1 10 c2 1b c4 08 57 |unt) "..|.......W|
|00002e60| ad 9f 08 53 10 c5 20 88 | c6 60 21 89 13 ab 6e c7 |...S.. .|.`!...n.|
|00002e70| 0b c8 5c 22 ab 68 c5 20 | 88 c6 60 21 89 13 ac 70 |..\".h. |..`!...p|
|00002e80| aa 5c 5c 29 87 22 20 5b | 63 6f 75 6e 74 20 31 20 |.\\)." [|count 1 |
|00002e90| 6e 69 6c 20 6f 76 65 72 | 6c 20 30 20 65 64 69 66 |nil over|l 0 edif|
|00002ea0| 66 2d 6e 65 78 74 2d 6d | 65 74 61 2d 69 74 65 6d |f-next-m|eta-item|
|00002eb0| 31 20 65 64 69 66 66 2d | 67 65 74 2d 6d 65 74 61 |1 ediff-|get-meta|
|00002ec0| 2d 6f 76 65 72 6c 61 79 | 2d 61 74 2d 70 6f 73 20 |-overlay|-at-pos |
|00002ed0| 65 64 69 66 66 2d 6f 76 | 65 72 6c 61 79 2d 67 65 |ediff-ov|erlay-ge|
|00002ee0| 74 20 69 6e 76 69 73 69 | 62 6c 65 5d 20 34 20 28 |t invisi|ble] 4 (|
|00002ef0| 23 24 20 2e 20 31 31 36 | 37 39 29 20 22 70 22 5d |#$ . 116|79) "p"]|
|00002f00| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00002f10| 66 66 2d 6e 65 78 74 2d | 6d 65 74 61 2d 69 74 65 |ff-next-|meta-ite|
|00002f20| 6d 31 20 23 5b 6e 69 6c | 20 22 c0 19 c2 60 21 89 |m1 #[nil| "...`!.|
|00002f30| 11 ab 83 09 62 88 0b c4 | 61 ab 93 c5 70 09 c6 23 |....b...|a...p..#|
|00002f40| ad 96 c7 c8 c0 c9 23 ad | 8f ca c0 78 aa 8a cb c0 |......#.|...x....|
|00002f50| 77 cc 56 ad 83 cd ce 21 | 29 87 22 20 5b 6e 69 6c |w.V....!|)." [nil|
|00002f60| 20 70 6f 73 20 65 64 69 | 66 66 2d 6e 65 78 74 2d | pos edi|ff-next-|
|00002f70| 6d 65 74 61 2d 6f 76 65 | 72 6c 61 79 2d 73 74 61 |meta-ove|rlay-sta|
|00002f80| 72 74 20 65 64 69 66 66 | 2d 6d 65 74 61 6a 6f 62 |rt ediff|-metajob|
|00002f90| 2d 6e 61 6d 65 20 65 64 | 69 66 66 2d 72 65 67 69 |-name ed|iff-regi|
|00002fa0| 73 74 72 79 20 65 64 69 | 66 66 2d 67 65 74 2d 6d |stry edi|ff-get-m|
|00002fb0| 65 74 61 2d 69 6e 66 6f | 20 6e 6f 65 72 72 6f 72 |eta-info| noerror|
|00002fc0| 20 73 65 61 72 63 68 2d | 66 6f 72 77 61 72 64 20 | search-|forward |
|00002fd0| 22 2a 45 64 69 66 66 22 | 20 74 20 22 61 2d 7a 41 |"*Ediff"| t "a-zA|
|00002fe0| 2d 5a 2a 22 20 22 2d 2b | 3f 48 2a 20 09 30 2d 39 |-Z*" "-+|?H* .0-9|
|00002ff0| 22 20 30 20 62 61 63 6b | 77 61 72 64 2d 63 68 61 |" 0 back|ward-cha|
|00003000| 72 20 31 5d 20 35 5d 29 | 0a 23 40 31 34 34 20 4d |r 1] 5])|.#@144 M|
|00003010| 6f 76 65 20 74 6f 20 74 | 68 65 20 70 72 65 76 69 |ove to t|he previ|
|00003020| 6f 75 73 20 69 74 65 6d | 20 69 6e 20 45 64 69 66 |ous item| in Edif|
|00003030| 66 20 72 65 67 69 73 74 | 72 79 20 6f 72 20 73 65 |f regist|ry or se|
|00003040| 73 73 69 6f 6e 20 67 72 | 6f 75 70 20 62 75 66 66 |ssion gr|oup buff|
|00003050| 65 72 2e 0a 4d 6f 76 65 | 73 20 69 6e 20 63 69 72 |er..Move|s in cir|
|00003060| 63 75 6c 61 72 20 66 61 | 73 68 69 6f 6e 2e 20 57 |cular fa|shion. W|
|00003070| 69 74 68 20 6e 75 6d 65 | 72 69 63 20 70 72 65 66 |ith nume|ric pref|
|00003080| 69 78 20 61 72 67 2c 20 | 73 6b 69 70 20 74 68 69 |ix arg, |skip thi|
|00003090| 73 20 6d 61 6e 79 20 69 | 74 65 6d 73 2e 1f 0a 28 |s many i|tems...(|
|000030a0| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|000030b0| 70 72 65 76 69 6f 75 73 | 2d 6d 65 74 61 2d 69 74 |previous|-meta-it|
|000030c0| 65 6d 20 23 5b 28 63 6f | 75 6e 74 29 20 22 08 ac |em #[(co|unt) "..|
|000030d0| 82 c1 10 c2 1b c4 08 57 | ad 9f 08 53 10 c5 20 88 |.......W|...S.. .|
|000030e0| c6 60 21 89 13 ab 6e c7 | 0b c8 5c 22 ab 68 c5 20 |.`!...n.|..\".h. |
|000030f0| 88 c6 60 21 89 13 ac 70 | aa 5c 5c 29 87 22 20 5b |..`!...p|.\\)." [|
|00003100| 63 6f 75 6e 74 20 31 20 | 6e 69 6c 20 6f 76 65 72 |count 1 |nil over|
|00003110| 6c 20 30 20 65 64 69 66 | 66 2d 70 72 65 76 69 6f |l 0 edif|f-previo|
|00003120| 75 73 2d 6d 65 74 61 2d | 69 74 65 6d 31 20 65 64 |us-meta-|item1 ed|
|00003130| 69 66 66 2d 67 65 74 2d | 6d 65 74 61 2d 6f 76 65 |iff-get-|meta-ove|
|00003140| 72 6c 61 79 2d 61 74 2d | 70 6f 73 20 65 64 69 66 |rlay-at-|pos edif|
|00003150| 66 2d 6f 76 65 72 6c 61 | 79 2d 67 65 74 20 69 6e |f-overla|y-get in|
|00003160| 76 69 73 69 62 6c 65 5d | 20 34 20 28 23 24 20 2e |visible]| 4 (#$ .|
|00003170| 20 31 32 33 30 33 29 20 | 22 70 22 5d 29 0a 28 64 | 12303) |"p"]).(d|
|00003180| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 70 |efalias |'ediff-p|
|00003190| 72 65 76 69 6f 75 73 2d | 6d 65 74 61 2d 69 74 65 |revious-|meta-ite|
|000031a0| 6d 31 20 23 5b 6e 69 6c | 20 22 c0 19 c2 60 21 89 |m1 #[nil| "...`!.|
|000031b0| 11 ab 83 09 62 88 0b c4 | 61 ab 93 c5 70 09 c6 23 |....b...|a...p..#|
|000031c0| ad 96 c7 c8 c0 c9 23 ad | 8f ca c0 78 aa 8a cb c0 |......#.|...x....|
|000031d0| 77 cc 56 ad 83 cd ce 21 | 29 87 22 20 5b 6e 69 6c |w.V....!|)." [nil|
|000031e0| 20 70 6f 73 20 65 64 69 | 66 66 2d 70 72 65 76 69 | pos edi|ff-previ|
|000031f0| 6f 75 73 2d 6d 65 74 61 | 2d 6f 76 65 72 6c 61 79 |ous-meta|-overlay|
|00003200| 2d 73 74 61 72 74 20 65 | 64 69 66 66 2d 6d 65 74 |-start e|diff-met|
|00003210| 61 6a 6f 62 2d 6e 61 6d | 65 20 65 64 69 66 66 2d |ajob-nam|e ediff-|
|00003220| 72 65 67 69 73 74 72 79 | 20 65 64 69 66 66 2d 67 |registry| ediff-g|
|00003230| 65 74 2d 6d 65 74 61 2d | 69 6e 66 6f 20 6e 6f 65 |et-meta-|info noe|
|00003240| 72 72 6f 72 20 73 65 61 | 72 63 68 2d 66 6f 72 77 |rror sea|rch-forw|
|00003250| 61 72 64 20 22 2a 45 64 | 69 66 66 22 20 74 20 22 |ard "*Ed|iff" t "|
|00003260| 61 2d 7a 41 2d 5a 2a 22 | 20 22 2d 2b 3f 48 2a 20 |a-zA-Z*"| "-+?H* |
|00003270| 09 30 2d 39 22 20 30 20 | 62 61 63 6b 77 61 72 64 |.0-9" 0 |backward|
|00003280| 2d 63 68 61 72 20 31 5d | 20 35 5d 29 0a 28 64 65 |-char 1]| 5]).(de|
|00003290| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 61 64 |falias '|ediff-ad|
|000032a0| 64 2d 73 6c 61 73 68 2d | 69 66 2d 64 69 72 65 63 |d-slash-|if-direc|
|000032b0| 74 6f 72 79 20 23 5b 28 | 64 69 72 20 66 69 6c 65 |tory #[(|dir file|
|000032c0| 29 20 22 c0 09 5c 6e 50 | 21 ab 84 c3 5c 6e 21 87 |) "..\nP|!...\n!.|
|000032d0| 5c 6e 87 22 20 5b 66 69 | 6c 65 2d 64 69 72 65 63 |\n." [fi|le-direc|
|000032e0| 74 6f 72 79 2d 70 20 64 | 69 72 20 66 69 6c 65 20 |tory-p d|ir file |
|000032f0| 66 69 6c 65 2d 6e 61 6d | 65 2d 61 73 2d 64 69 72 |file-nam|e-as-dir|
|00003300| 65 63 74 6f 72 79 5d 20 | 33 5d 29 0a 28 62 79 74 |ectory] |3]).(byt|
|00003310| 65 2d 63 6f 64 65 20 22 | c0 c1 4e c2 73 ac 85 c3 |e-code "|..N.s...|
|00003320| c4 c0 5c 22 88 c5 c0 c1 | c6 23 87 22 20 5b 65 64 |..\"....|.#." [ed|
|00003330| 69 66 66 2d 61 64 64 2d | 73 6c 61 73 68 2d 69 66 |iff-add-|slash-if|
|00003340| 2d 64 69 72 65 63 74 6f | 72 79 20 62 79 74 65 2d |-directo|ry byte-|
|00003350| 6f 70 74 69 6d 69 7a 65 | 72 20 28 6e 69 6c 20 62 |optimize|r (nil b|
|00003360| 79 74 65 2d 63 6f 6d 70 | 69 6c 65 2d 69 6e 6c 69 |yte-comp|ile-inli|
|00003370| 6e 65 2d 65 78 70 61 6e | 64 29 20 65 72 72 6f 72 |ne-expan|d) error|
|00003380| 20 22 25 73 20 61 6c 72 | 65 61 64 79 20 68 61 73 | "%s alr|eady has|
|00003390| 20 61 20 62 79 74 65 2d | 6f 70 74 69 6d 69 7a 65 | a byte-|optimize|
|000033a0| 72 2c 20 63 61 6e 27 74 | 20 6d 61 6b 65 20 69 74 |r, can't| make it|
|000033b0| 20 69 6e 6c 69 6e 65 22 | 20 70 75 74 20 62 79 74 | inline"| put byt|
|000033c0| 65 2d 63 6f 6d 70 69 6c | 65 2d 69 6e 6c 69 6e 65 |e-compil|e-inline|
|000033d0| 2d 65 78 70 61 6e 64 5d | 20 34 29 0a 23 40 31 35 |-expand]| 4).#@15|
|000033e0| 33 20 54 6f 67 67 6c 65 | 20 74 72 75 6e 63 61 74 |3 Toggle| truncat|
|000033f0| 69 6f 6e 20 6f 66 20 6c | 6f 6e 67 20 66 69 6c 65 |ion of l|ong file|
|00003400| 20 6e 61 6d 65 73 20 69 | 6e 20 73 65 73 73 69 6f | names i|n sessio|
|00003410| 6e 20 67 72 6f 75 70 20 | 62 75 66 66 65 72 73 2e |n group |buffers.|
|00003420| 0a 53 65 74 20 60 65 64 | 69 66 66 2d 6d 65 74 61 |.Set `ed|iff-meta|
|00003430| 2d 74 72 75 6e 63 61 74 | 65 2d 66 69 6c 65 6e 61 |-truncat|e-filena|
|00003440| 6d 65 73 27 20 76 61 72 | 69 61 62 6c 65 20 69 66 |mes' var|iable if|
|00003450| 20 79 6f 75 20 77 61 6e | 74 20 74 6f 20 63 68 61 | you wan|t to cha|
|00003460| 6e 67 65 20 74 68 65 20 | 64 65 66 61 75 6c 74 0a |nge the |default.|
|00003470| 62 65 68 61 76 69 6f 72 | 2e 1f 0a 28 64 65 66 61 |behavior|...(defa|
|00003480| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 74 6f 67 67 |lias 'ed|iff-togg|
|00003490| 6c 65 2d 66 69 6c 65 6e | 61 6d 65 2d 74 72 75 6e |le-filen|ame-trun|
|000034a0| 63 61 74 69 6f 6e 20 23 | 5b 6e 69 6c 20 22 08 3f |cation #|[nil ".?|
|000034b0| 10 c1 70 c2 5c 22 87 22 | 20 5b 65 64 69 66 66 2d |..p.\"."| [ediff-|
|000034c0| 6d 65 74 61 2d 74 72 75 | 6e 63 61 74 65 2d 66 69 |meta-tru|ncate-fi|
|000034d0| 6c 65 6e 61 6d 65 73 20 | 65 64 69 66 66 2d 75 70 |lenames |ediff-up|
|000034e0| 64 61 74 65 2d 6d 65 74 | 61 2d 62 75 66 66 65 72 |date-met|a-buffer|
|000034f0| 20 6d 75 73 74 2d 72 65 | 64 72 61 77 5d 20 33 20 | must-re|draw] 3 |
|00003500| 28 23 24 20 2e 20 31 33 | 32 38 32 29 20 6e 69 6c |(#$ . 13|282) nil|
|00003510| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00003520| 69 66 66 2d 69 6e 74 65 | 72 73 65 63 74 2d 64 69 |iff-inte|rsect-di|
|00003530| 72 65 63 74 6f 72 69 65 | 73 20 23 5b 28 6a 6f 62 |rectorie|s #[(job|
|00003540| 6e 61 6d 65 20 64 69 66 | 66 2d 76 61 72 20 72 65 |name dif|f-var re|
|00003550| 67 65 78 70 20 64 69 72 | 31 20 64 69 72 32 20 26 |gexp dir|1 dir2 &|
|00003560| 6f 70 74 69 6f 6e 61 6c | 20 64 69 72 33 20 6d 65 |optional| dir3 me|
|00003570| 72 67 65 2d 61 75 74 6f | 73 74 6f 72 65 2d 64 69 |rge-auto|store-di|
|00003580| 72 20 63 6f 6d 70 61 72 | 69 73 6f 6e 2d 66 75 6e |r compar|ison-fun|
|00003590| 63 29 20 22 08 ae 81 c1 | 10 c2 89 89 89 89 89 89 |c) "....|........|
|000035a0| 89 1b 1c 1d 1e 06 1e 07 | 1e 08 1e 09 1e 5c 6e cb |........|.....\n.|
|000035b0| 0e 0c 21 16 06 cd 0e 06 | c2 0e 0e 23 16 5c 6e cf |..!.....|...#.\n.|
|000035c0| d0 0e 5c 6e 5c 22 16 5c | 6e cf d1 0e 5c 6e 5c 22 |..\n\".\|n...\n\"|
|000035d0| 16 5c 6e d2 d3 0e 5c 6e | 5c 22 16 5c 6e cb 0e 14 |.\n...\n|\".\n...|
|000035e0| 21 15 d2 d5 cd 0d c2 0e | 0e 23 5c 22 16 09 0e 16 |!.......|.#\"....|
|000035f0| 3b ab 90 cb 0e 16 21 14 | d2 d7 cd 0c c2 0e 0e 23 |;.....!.|.......#|
|00003600| 5c 22 16 08 0e 18 3b ab | 86 cb 0e 18 21 16 18 d9 |\"....;.|....!...|
|00003610| 0e 5c 6e 0e 09 08 23 16 | 07 0e 08 ab 97 0e 1a 89 |.\n...#.|........|
|00003620| 1e 1b ae 82 0e 1c dd 73 | 29 ab 89 d9 0e 07 0e 08 |.......s|).......|
|00003630| 08 23 16 07 de df 0e 07 | 21 e0 5c 22 16 07 e1 e2 |.#......|!.\"....|
|00003640| 89 0e 5c 6e 0e 09 08 23 | 0e 08 08 23 0e 07 08 23 |..\n...#|...#...#|
|00003650| 13 cf d0 0b 5c 22 13 de | df cf d1 0b 5c 22 21 e0 |....\"..|....\"!.|
|00003660| 5c 22 13 d2 e3 0b 5c 22 | 13 d2 e4 0b 5c 22 88 0e |\"....\"|....\"..|
|00003670| 0e 0e 06 0d 0c 46 0b 42 | 13 0e 25 0b 4c 88 0e 0e |.....F.B|..%.L...|
|00003680| 0e 06 0d 0c 0e 18 af 05 | d2 e6 0e 07 5c 22 2e 08 |........|....\"..|
|00003690| 42 87 22 20 5b 63 6f 6d | 70 61 72 69 73 6f 6e 2d |B." [com|parison-|
|000036a0| 66 75 6e 63 20 73 74 72 | 69 6e 67 3d 20 6e 69 6c |func str|ing= nil|
|000036b0| 20 64 69 66 66 6c 69 73 | 74 20 61 75 78 64 69 72 | difflis|t auxdir|
|000036c0| 33 20 61 75 78 64 69 72 | 32 20 61 75 78 64 69 72 |3 auxdir|2 auxdir|
|000036d0| 31 20 63 6f 6d 6d 6f 6e | 20 6c 69 73 33 20 6c 69 |1 common| lis3 li|
|000036e0| 73 32 20 6c 69 73 31 20 | 66 69 6c 65 2d 6e 61 6d |s2 lis1 |file-nam|
|000036f0| 65 2d 61 73 2d 64 69 72 | 65 63 74 6f 72 79 20 64 |e-as-dir|ectory d|
|00003700| 69 72 31 20 64 69 72 65 | 63 74 6f 72 79 2d 66 69 |ir1 dire|ctory-fi|
|00003710| 6c 65 73 20 72 65 67 65 | 78 70 20 64 65 6c 65 74 |les rege|xp delet|
|00003720| 65 20 22 2e 22 20 22 2e | 2e 22 20 6d 61 70 63 61 |e "." ".|." mapca|
|00003730| 72 20 23 5b 28 65 6c 74 | 29 20 22 08 09 1a 1b c4 |r #[(elt|) ".....|
|00003740| 0b 5c 6e 50 21 ab 85 c5 | 5c 6e 21 aa 81 5c 6e 2a |.\nP!...|\n!..\n*|
|00003750| 87 22 20 5b 61 75 78 64 | 69 72 31 20 65 6c 74 20 |." [auxd|ir1 elt |
|00003760| 66 69 6c 65 20 64 69 72 | 20 66 69 6c 65 2d 64 69 |file dir| file-di|
|00003770| 72 65 63 74 6f 72 79 2d | 70 20 66 69 6c 65 2d 6e |rectory-|p file-n|
|00003780| 61 6d 65 2d 61 73 2d 64 | 69 72 65 63 74 6f 72 79 |ame-as-d|irectory|
|00003790| 5d 20 33 5d 20 64 69 72 | 32 20 23 5b 28 65 6c 74 |] 3] dir|2 #[(elt|
|000037a0| 29 20 22 08 09 1a 1b c4 | 0b 5c 6e 50 21 ab 85 c5 |) ".....|.\nP!...|
|000037b0| 5c 6e 21 aa 81 5c 6e 2a | 87 22 20 5b 61 75 78 64 |\n!..\n*|." [auxd|
|000037c0| 69 72 32 20 65 6c 74 20 | 66 69 6c 65 20 64 69 72 |ir2 elt |file dir|
|000037d0| 20 66 69 6c 65 2d 64 69 | 72 65 63 74 6f 72 79 2d | file-di|rectory-|
|000037e0| 70 20 66 69 6c 65 2d 6e | 61 6d 65 2d 61 73 2d 64 |p file-n|ame-as-d|
|000037f0| 69 72 65 63 74 6f 72 79 | 5d 20 33 5d 20 64 69 72 |irectory|] 3] dir|
|00003800| 33 20 23 5b 28 65 6c 74 | 29 20 22 08 09 1a 1b c4 |3 #[(elt|) ".....|
|00003810| 0b 5c 6e 50 21 ab 85 c5 | 5c 6e 21 aa 81 5c 6e 2a |.\nP!...|\n!..\n*|
|00003820| 87 22 20 5b 61 75 78 64 | 69 72 33 20 65 6c 74 20 |." [auxd|ir3 elt |
|00003830| 66 69 6c 65 20 64 69 72 | 20 66 69 6c 65 2d 64 69 |file dir| file-di|
|00003840| 72 65 63 74 6f 72 79 2d | 70 20 66 69 6c 65 2d 6e |rectory-|p file-n|
|00003850| 61 6d 65 2d 61 73 2d 64 | 69 72 65 63 74 6f 72 79 |ame-as-d|irectory|
|00003860| 5d 20 33 5d 20 6d 65 72 | 67 65 2d 61 75 74 6f 73 |] 3] mer|ge-autos|
|00003870| 74 6f 72 65 2d 64 69 72 | 20 65 64 69 66 66 2d 69 |tore-dir| ediff-i|
|00003880| 6e 74 65 72 73 65 63 74 | 69 6f 6e 20 6a 6f 62 6e |ntersect|ion jobn|
|00003890| 61 6d 65 20 6d 65 74 61 | 6a 6f 62 20 65 64 69 66 |ame meta|job edif|
|000038a0| 66 2d 6d 65 74 61 6a 6f | 62 2d 6e 61 6d 65 20 28 |f-metajo|b-name (|
|000038b0| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 69 65 |ediff-di|rectorie|
|000038c0| 73 33 20 65 64 69 66 66 | 2d 66 69 6c 65 67 72 6f |s3 ediff|-filegro|
|000038d0| 75 70 73 33 29 20 73 6f | 72 74 20 65 64 69 66 66 |ups3) so|rt ediff|
|000038e0| 2d 63 6f 70 79 2d 6c 69 | 73 74 20 73 74 72 69 6e |-copy-li|st strin|
|000038f0| 67 2d 6c 65 73 73 70 20 | 65 64 69 66 66 2d 73 65 |g-lessp |ediff-se|
|00003900| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 20 65 64 69 |t-differ|ence edi|
|00003910| 66 66 2d 75 6e 69 6f 6e | 20 23 5b 28 65 6c 74 29 |ff-union| #[(elt)|
|00003920| 20 22 08 c1 42 87 22 20 | 5b 65 6c 74 20 31 5d 20 | "..B." |[elt 1] |
|00003930| 32 5d 20 23 5b 28 65 6c | 74 29 20 22 08 40 09 b6 |2] #[(el|t) ".@..|
|00003940| ab 87 08 89 41 c2 5f a1 | 88 08 40 0b b6 ab 87 08 |....A._.|..@.....|
|00003950| 89 41 c4 5f a1 88 08 40 | 0d b6 ad 86 08 89 41 c6 |.A._...@|......A.|
|00003960| 5f a1 87 22 20 5b 65 6c | 74 20 6c 69 73 31 20 32 |_.." [el|t lis1 2|
|00003970| 20 6c 69 73 32 20 33 20 | 6c 69 73 33 20 35 5d 20 | lis2 3 |lis3 5] |
|00003980| 33 5d 20 64 69 66 66 2d | 76 61 72 20 23 5b 28 65 |3] diff-|var #[(e|
|00003990| 6c 74 29 20 22 08 09 50 | 5c 6e 09 50 0b ad 9f 0c |lt) "..P|\n.P....|
|000039a0| 09 1d 1e 06 c7 0e 06 0d | 50 21 ab 85 c8 0d 21 aa |........|P!....!.|
|000039b0| 81 0d 2a 11 c9 0c 09 50 | 21 ad 83 0c 09 50 45 87 |..*....P|!....PE.|
|000039c0| 22 20 5b 61 75 78 64 69 | 72 31 20 65 6c 74 20 61 |" [auxdi|r1 elt a|
|000039d0| 75 78 64 69 72 32 20 6c | 69 73 33 20 61 75 78 64 |uxdir2 l|is3 auxd|
|000039e0| 69 72 33 20 66 69 6c 65 | 20 64 69 72 20 66 69 6c |ir3 file| dir fil|
|000039f0| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 70 20 66 69 |e-direct|ory-p fi|
|00003a00| 6c 65 2d 6e 61 6d 65 2d | 61 73 2d 64 69 72 65 63 |le-name-|as-direc|
|00003a10| 74 6f 72 79 20 66 69 6c | 65 2d 65 78 69 73 74 73 |tory fil|e-exists|
|00003a20| 2d 70 5d 20 35 5d 5d 20 | 39 5d 29 0a 28 64 65 66 |-p] 5]] |9]).(def|
|00003a30| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 67 65 74 |alias 'e|diff-get|
|00003a40| 2d 64 69 72 65 63 74 6f | 72 79 2d 66 69 6c 65 73 |-directo|ry-files|
|00003a50| 2d 75 6e 64 65 72 2d 72 | 65 76 69 73 69 6f 6e 20 |-under-r|evision |
|00003a60| 23 5b 28 6a 6f 62 6e 61 | 6d 65 20 72 65 67 65 78 |#[(jobna|me regex|
|00003a70| 70 20 64 69 72 31 20 26 | 6f 70 74 69 6f 6e 61 6c |p dir1 &|optional|
|00003a80| 20 6d 65 72 67 65 2d 61 | 75 74 6f 73 74 6f 72 65 | merge-a|utostore|
|00003a90| 2d 64 69 72 29 20 22 c0 | 89 89 89 19 1a 1b 1c c5 |-dir) ".|........|
|00003aa0| 0e 06 21 11 c7 09 c0 0e | 08 23 14 0e 09 3b ab 86 |..!.....|.#...;..|
|00003ab0| c5 0e 09 21 16 09 0c ab | c7 0c 40 13 0c 41 14 ca |...!....|..@..A..|
|00003ac0| 09 0b 50 21 ab 9d 09 0b | 1e 0b 1e 0c ca 0e 0c 0e |..P!....|........|
|00003ad0| 0b 50 21 ab 86 c5 0e 0b | 21 aa 82 0e 0b 2a 5c 6e |.P!.....|!....*\n|
|00003ae0| 42 12 aa 53 cd 09 0b ce | 51 21 ab 86 0b 5c 6e 42 |B..S....|Q!...\nB|
|00003af0| 12 aa 45 cd 09 cf 0b ce | 52 21 ab 3c 0b 5c 6e 42 |..E.....|R!.<.\nB|
|00003b00| 12 aa 36 d0 d1 5c 6e 5c | 22 12 d0 d2 5c 6e 5c 22 |..6..\n\|"...\n\"|
|00003b10| 12 d0 d3 5c 6e 5c 22 12 | d4 d5 5c 6e 21 d6 5c 22 |...\n\".|..\n!.\"|
|00003b20| 12 0e 08 09 c0 89 0e 09 | af 05 d7 d8 5c 6e 5c 22 |........|....\n\"|
|00003b30| 2c 42 87 22 20 5b 6e 69 | 6c 20 61 75 78 64 69 72 |,B." [ni|l auxdir|
|00003b40| 31 20 63 6f 6d 6d 6f 6e | 20 65 6c 74 20 6c 69 73 |1 common| elt lis|
|00003b50| 31 20 66 69 6c 65 2d 6e | 61 6d 65 2d 61 73 2d 64 |1 file-n|ame-as-d|
|00003b60| 69 72 65 63 74 6f 72 79 | 20 64 69 72 31 20 64 69 |irectory| dir1 di|
|00003b70| 72 65 63 74 6f 72 79 2d | 66 69 6c 65 73 20 72 65 |rectory-|files re|
|00003b80| 67 65 78 70 20 6d 65 72 | 67 65 2d 61 75 74 6f 73 |gexp mer|ge-autos|
|00003b90| 74 6f 72 65 2d 64 69 72 | 20 66 69 6c 65 2d 64 69 |tore-dir| file-di|
|00003ba0| 72 65 63 74 6f 72 79 2d | 70 20 66 69 6c 65 20 64 |rectory-|p file d|
|00003bb0| 69 72 20 66 69 6c 65 2d | 65 78 69 73 74 73 2d 70 |ir file-|exists-p|
|00003bc0| 20 22 2c 76 22 20 22 52 | 43 53 2f 22 20 64 65 6c | ",v" "R|CS/" del|
|00003bd0| 65 74 65 20 22 2e 2f 22 | 20 22 2e 2e 2f 22 20 22 |ete "./"| "../" "|
|00003be0| 52 43 53 22 20 73 6f 72 | 74 20 65 64 69 66 66 2d |RCS" sor|t ediff-|
|00003bf0| 63 6f 70 79 2d 6c 69 73 | 74 20 73 74 72 69 6e 67 |copy-lis|t string|
|00003c00| 2d 6c 65 73 73 70 20 6d | 61 70 63 61 72 20 23 5b |-lessp m|apcar #[|
|00003c10| 28 65 6c 74 29 20 22 08 | 09 50 c2 89 45 87 22 20 |(elt) ".|.P..E." |
|00003c20| 5b 61 75 78 64 69 72 31 | 20 65 6c 74 20 6e 69 6c |[auxdir1| elt nil|
|00003c30| 5d 20 33 5d 5d 20 35 5d | 29 0a 28 64 65 66 61 6c |] 3]] 5]|).(defal|
|00003c40| 69 61 73 20 27 65 64 69 | 66 66 2d 70 72 65 70 61 |ias 'edi|ff-prepa|
|00003c50| 72 65 2d 6d 65 74 61 2d | 62 75 66 66 65 72 20 23 |re-meta-|buffer #|
|00003c60| 5b 28 61 63 74 69 6f 6e | 2d 66 75 6e 63 20 6d 65 |[(action|-func me|
|00003c70| 74 61 2d 6c 69 73 74 20 | 6d 65 74 61 2d 62 75 66 |ta-list |meta-buf|
|00003c80| 66 65 72 2d 6e 61 6d 65 | 20 72 65 64 72 61 77 2d |fer-name| redraw-|
|00003c90| 66 75 6e 63 74 69 6f 6e | 20 6a 6f 62 6e 61 6d 65 |function| jobname|
|00003ca0| 20 26 6f 70 74 69 6f 6e | 61 6c 20 73 74 61 72 74 | &option|al start|
|00003cb0| 75 70 2d 68 6f 6f 6b 73 | 29 20 22 c0 09 c2 5c 22 |up-hooks|) "...\"|
|00003cc0| 19 c3 09 21 89 1c 83 f3 | 00 c5 0c 21 83 f3 00 c6 |...!....|...!....|
|00003cd0| c5 0c 21 21 83 f3 00 72 | 0c 71 88 c7 20 88 0e 08 |..!!...r|.q.. ...|
|00003ce0| 16 09 0e 5c 6e 16 0b 0e | 0c 16 0d 0c 16 0e cf 20 |...\n...|....... |
|00003cf0| 88 0e 0d d0 61 ab 90 0c | 16 11 0e 12 16 13 d4 0e |....a...|........|
|00003d00| 15 d6 d7 23 88 aa 8e 0c | 0e 12 40 42 d8 d9 0e 12 |...#....|..@B....|
|00003d10| 41 5c 22 42 16 13 0c 0e | 11 61 ac 86 0c 0e 1a 42 |A\"B....|.a.....B|
|00003d20| 16 1a 0e 5c 6e 0e 13 21 | 88 db 16 1c dd de 21 88 |...\n..!|......!.|
|00003d30| df e0 21 88 0e 08 e1 61 | ab e5 0c 0e 5c 22 40 42 |..!....a|....\"@B|
|00003d40| 0e 5c 22 41 42 16 5c 22 | e3 0e 0c 21 ac 85 e4 0e |.\"AB.\"|...!....|
|00003d50| 5c 22 21 88 d4 0e 15 e5 | e6 23 88 d4 0e 15 e7 e8 |\"!.....|.#......|
|00003d60| 23 88 d4 0e 15 e9 ea 23 | 88 0e 0c 89 1e 2b ae 82 |#......#|.....+..|
|00003d70| 0e 0d ec 73 29 ab 89 d4 | 0e 15 ed ee 23 88 aa 95 |...s)...|....#...|
|00003d80| 0e 0c 89 1e 2b ae 82 0e | 0d ef 73 29 ab 87 d4 0e |....+...|..s)....|
|00003d90| 15 ed f0 23 88 d4 0e 15 | f1 f2 23 88 d4 0e 15 f3 |...#....|..#.....|
|00003da0| f4 23 88 0e 0d d0 61 ab | 86 df f5 21 88 aa 84 df |.#....a.|...!....|
|00003db0| f6 21 88 29 aa 8b 0e 37 | f8 61 ac 85 f9 0e 3a 21 |.!.)...7|.a....:!|
|00003dc0| 88 0c 2a 87 22 20 5b 65 | 64 69 66 66 2d 75 6e 69 |..*." [e|diff-uni|
|00003dd0| 71 75 65 2d 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |que-buff|er-name |
|00003de0| 6d 65 74 61 2d 62 75 66 | 66 65 72 2d 6e 61 6d 65 |meta-buf|fer-name|
|00003df0| 20 22 2a 22 20 67 65 74 | 2d 62 75 66 66 65 72 2d | "*" get|-buffer-|
|00003e00| 63 72 65 61 74 65 20 6d | 65 74 61 2d 62 75 66 66 |create m|eta-buff|
|00003e10| 65 72 20 67 65 74 2d 62 | 75 66 66 65 72 20 62 75 |er get-b|uffer bu|
|00003e20| 66 66 65 72 2d 6e 61 6d | 65 20 65 64 69 66 66 2d |ffer-nam|e ediff-|
|00003e30| 6d 65 74 61 2d 6d 6f 64 | 65 20 61 63 74 69 6f 6e |meta-mod|e action|
|00003e40| 2d 66 75 6e 63 20 65 64 | 69 66 66 2d 6d 65 74 61 |-func ed|iff-meta|
|00003e50| 2d 61 63 74 69 6f 6e 2d | 66 75 6e 63 74 69 6f 6e |-action-|function|
|00003e60| 20 72 65 64 72 61 77 2d | 66 75 6e 63 74 69 6f 6e | redraw-|function|
|00003e70| 20 65 64 69 66 66 2d 6d | 65 74 61 2d 72 65 64 72 | ediff-m|eta-redr|
|00003e80| 61 77 2d 66 75 6e 63 74 | 69 6f 6e 20 6a 6f 62 6e |aw-funct|ion jobn|
|00003e90| 61 6d 65 20 65 64 69 66 | 66 2d 6d 65 74 61 6a 6f |ame edif|f-metajo|
|00003ea0| 62 2d 6e 61 6d 65 20 65 | 64 69 66 66 2d 6d 65 74 |b-name e|diff-met|
|00003eb0| 61 2d 62 75 66 66 65 72 | 20 65 64 69 66 66 2d 73 |a-buffer| ediff-s|
|00003ec0| 65 74 75 70 2d 6d 65 74 | 61 2d 6d 61 70 20 65 64 |etup-met|a-map ed|
|00003ed0| 69 66 66 2d 72 65 67 69 | 73 74 72 79 20 65 64 69 |iff-regi|stry edi|
|00003ee0| 66 66 2d 72 65 67 69 73 | 74 72 79 2d 62 75 66 66 |ff-regis|try-buff|
|00003ef0| 65 72 20 6d 65 74 61 2d | 6c 69 73 74 20 65 64 69 |er meta-|list edi|
|00003f00| 66 66 2d 6d 65 74 61 2d | 6c 69 73 74 20 64 65 66 |ff-meta-|list def|
|00003f10| 69 6e 65 2d 6b 65 79 20 | 65 64 69 66 66 2d 6d 65 |ine-key |ediff-me|
|00003f20| 74 61 2d 62 75 66 66 65 | 72 2d 6d 61 70 20 22 4d |ta-buffe|r-map "M|
|00003f30| 22 20 65 64 69 66 66 2d | 73 68 6f 77 2d 6d 65 74 |" ediff-|show-met|
|00003f40| 61 2d 62 75 66 66 2d 66 | 72 6f 6d 2d 72 65 67 69 |a-buff-f|rom-regi|
|00003f50| 73 74 72 79 20 6d 61 70 | 63 61 72 20 23 5b 28 65 |stry map|car #[(e|
|00003f60| 6c 74 29 20 22 c0 89 c1 | c2 0b 5c 22 42 42 87 22 |lt) "...|..\"BB."|
|00003f70| 20 5b 6e 69 6c 20 6d 61 | 70 63 61 72 20 23 5b 28 | [nil ma|pcar #[(|
|00003f80| 6f 62 6a 29 20 22 08 c1 | 44 87 22 20 5b 6f 62 6a |obj) "..|D." [obj|
|00003f90| 20 6e 69 6c 5d 20 32 5d | 20 65 6c 74 5d 20 35 5d | nil] 2]| elt] 5]|
|00003fa0| 20 65 64 69 66 66 2d 73 | 65 73 73 69 6f 6e 2d 72 | ediff-s|ession-r|
|00003fb0| 65 67 69 73 74 72 79 20 | 74 20 62 75 66 66 65 72 |egistry |t buffer|
|00003fc0| 2d 72 65 61 64 2d 6f 6e | 6c 79 20 73 65 74 2d 62 |-read-on|ly set-b|
|00003fd0| 75 66 66 65 72 2d 6d 6f | 64 69 66 69 65 64 2d 70 |uffer-mo|dified-p|
|00003fe0| 20 6e 69 6c 20 72 75 6e | 2d 68 6f 6f 6b 73 20 73 | nil run|-hooks s|
|00003ff0| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 65 64 69 |tartup-h|ooks edi|
|00004000| 66 66 2d 66 69 6c 65 67 | 72 6f 75 70 2d 61 63 74 |ff-fileg|roup-act|
|00004010| 69 6f 6e 20 65 64 69 66 | 66 2d 64 69 72 2d 64 69 |ion edif|f-dir-di|
|00004020| 66 66 65 72 65 6e 63 65 | 2d 6c 69 73 74 20 65 64 |fference|-list ed|
|00004030| 69 66 66 2d 6f 6e 65 2d | 66 69 6c 65 67 72 6f 75 |iff-one-|filegrou|
|00004040| 70 2d 6d 65 74 61 6a 6f | 62 20 65 64 69 66 66 2d |p-metajo|b ediff-|
|00004050| 64 72 61 77 2d 64 69 72 | 2d 64 69 66 66 73 20 22 |draw-dir|-diffs "|
|00004060| 68 22 20 65 64 69 66 66 | 2d 6d 61 72 6b 2d 66 6f |h" ediff|-mark-fo|
|00004070| 72 2d 68 69 64 69 6e 67 | 20 22 78 22 20 65 64 69 |r-hiding| "x" edi|
|00004080| 66 66 2d 68 69 64 65 2d | 6d 61 72 6b 65 64 2d 73 |ff-hide-|marked-s|
|00004090| 65 73 73 69 6f 6e 73 20 | 22 6d 22 20 65 64 69 66 |essions |"m" edif|
|000040a0| 66 2d 6d 61 72 6b 2d 66 | 6f 72 2d 6f 70 65 72 61 |f-mark-f|or-opera|
|000040b0| 74 69 6f 6e 20 6d 65 74 | 61 6a 6f 62 20 28 65 64 |tion met|ajob (ed|
|000040c0| 69 66 66 2d 64 69 72 65 | 63 74 6f 72 69 65 73 20 |iff-dire|ctories |
|000040d0| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 79 2d |ediff-di|rectory-|
|000040e0| 72 65 76 69 73 69 6f 6e | 73 20 65 64 69 66 66 2d |revision|s ediff-|
|000040f0| 6d 65 72 67 65 2d 64 69 | 72 65 63 74 6f 72 69 65 |merge-di|rectorie|
|00004100| 73 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |s ediff-|merge-di|
|00004110| 72 65 63 74 6f 72 69 65 | 73 2d 77 69 74 68 2d 61 |rectorie|s-with-a|
|00004120| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 6d 65 |ncestor |ediff-me|
|00004130| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 79 2d 72 65 |rge-dire|ctory-re|
|00004140| 76 69 73 69 6f 6e 73 20 | 65 64 69 66 66 2d 6d 65 |visions |ediff-me|
|00004150| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 79 2d 72 65 |rge-dire|ctory-re|
|00004160| 76 69 73 69 6f 6e 73 2d | 77 69 74 68 2d 61 6e 63 |visions-|with-anc|
|00004170| 65 73 74 6f 72 29 20 22 | 50 22 20 65 64 69 66 66 |estor) "|P" ediff|
|00004180| 2d 63 6f 6c 6c 65 63 74 | 2d 63 75 73 74 6f 6d 2d |-collect|-custom-|
|00004190| 64 69 66 66 73 20 28 65 | 64 69 66 66 2d 6d 75 6c |diffs (e|diff-mul|
|000041a0| 74 69 66 69 6c 65 2d 70 | 61 74 63 68 29 20 65 64 |tifile-p|atch) ed|
|000041b0| 69 66 66 2d 6d 65 74 61 | 2d 73 68 6f 77 2d 70 61 |iff-meta|-show-pa|
|000041c0| 74 63 68 20 22 75 22 20 | 65 64 69 66 66 2d 75 70 |tch "u" |ediff-up|
|000041d0| 2d 6d 65 74 61 2d 68 69 | 65 72 61 72 63 68 79 20 |-meta-hi|erarchy |
|000041e0| 22 44 22 20 65 64 69 66 | 66 2d 73 68 6f 77 2d 64 |"D" edif|f-show-d|
|000041f0| 69 72 2d 64 69 66 66 73 | 20 65 64 69 66 66 2d 72 |ir-diffs| ediff-r|
|00004200| 65 67 69 73 74 72 79 2d | 73 65 74 75 70 2d 68 6f |egistry-|setup-ho|
|00004210| 6f 6b 20 65 64 69 66 66 | 2d 73 65 73 73 69 6f 6e |ok ediff|-session|
|00004220| 2d 67 72 6f 75 70 2d 73 | 65 74 75 70 2d 68 6f 6f |-group-s|etup-hoo|
|00004230| 6b 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |k this-c|ommand e|
|00004240| 64 69 66 66 2d 71 75 69 | 74 20 65 72 72 6f 72 20 |diff-qui|t error |
|00004250| 65 64 69 66 66 2d 4b 49 | 4c 4c 45 44 2d 56 49 54 |ediff-KI|LLED-VIT|
|00004260| 41 4c 2d 42 55 46 46 45 | 52 5d 20 35 5d 29 0a 28 |AL-BUFFE|R] 5]).(|
|00004270| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00004280| 69 6e 73 65 72 74 2d 73 | 65 73 73 69 6f 6e 2d 61 |insert-s|ession-a|
|00004290| 63 74 69 76 69 74 79 2d | 6d 61 72 6b 65 72 2d 69 |ctivity-|marker-i|
|000042a0| 6e 2d 6d 65 74 61 2d 62 | 75 66 66 65 72 20 23 5b |n-meta-b|uffer #[|
|000042b0| 28 73 65 73 73 69 6f 6e | 29 20 22 c0 09 21 ae 81 |(session|) "..!..|
|000042c0| c2 63 87 22 20 5b 65 64 | 69 66 66 2d 67 65 74 2d |.c." [ed|iff-get-|
|000042d0| 73 65 73 73 69 6f 6e 2d | 61 63 74 69 76 69 74 79 |session-|activity|
|000042e0| 2d 6d 61 72 6b 65 72 20 | 73 65 73 73 69 6f 6e 20 |-marker |session |
|000042f0| 22 20 22 5d 20 32 5d 29 | 0a 28 64 65 66 61 6c 69 |" "] 2])|.(defali|
|00004300| 61 73 20 27 65 64 69 66 | 66 2d 69 6e 73 65 72 74 |as 'edif|f-insert|
|00004310| 2d 73 65 73 73 69 6f 6e | 2d 73 74 61 74 75 73 2d |-session|-status-|
|00004320| 69 6e 2d 6d 65 74 61 2d | 62 75 66 66 65 72 20 23 |in-meta-|buffer #|
|00004330| 5b 28 73 65 73 73 69 6f | 6e 29 20 22 08 89 19 41 |[(sessio|n) "...A|
|00004340| 40 29 ae 81 c2 63 87 22 | 20 5b 73 65 73 73 69 6f |@)...c."| [sessio|
|00004350| 6e 20 65 6c 74 20 22 20 | 22 5d 20 32 5d 29 0a 28 |n elt " |"] 2]).(|
|00004360| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00004370| 72 65 70 6c 61 63 65 2d | 73 65 73 73 69 6f 6e 2d |replace-|session-|
|00004380| 61 63 74 69 76 69 74 79 | 2d 6d 61 72 6b 65 72 2d |activity|-marker-|
|00004390| 69 6e 2d 6d 65 74 61 2d | 62 75 66 66 65 72 20 23 |in-meta-|buffer #|
|000043a0| 5b 28 70 6f 69 6e 74 20 | 6e 65 77 2d 6d 61 72 6b |[(point |new-mark|
|000043b0| 65 72 29 20 22 c0 09 21 | 1a c3 5c 6e c4 5c 22 1d |er) "..!|..\n.\".|
|000043c0| c6 0d 21 1e 07 c8 1e 09 | 0e 5c 6e ac 87 0e 07 ac |..!.....|.\n.....|
|000043d0| 83 cb 16 5c 6e 5c 6e 1a | cc 5c 6e 21 ad 8c 0e 0d |...\n\n.|.\n!....|
|000043e0| ab 85 ce 5c 6e 21 aa 83 | cf 5c 6e 21 29 62 88 60 |...\n!..|.\n!)b.`|
|000043f0| 66 0e 5c 6e 61 3f ad 8b | 0e 5c 6e 63 88 d0 d1 21 |f.\na?..|.\nc...!|
|00004400| 88 d2 c8 21 2c 87 22 20 | 5b 65 64 69 66 66 2d 67 |...!,." |[ediff-g|
|00004410| 65 74 2d 6d 65 74 61 2d | 6f 76 65 72 6c 61 79 2d |et-meta-|overlay-|
|00004420| 61 74 2d 70 6f 73 20 70 | 6f 69 6e 74 20 6f 76 65 |at-pos p|oint ove|
|00004430| 72 6c 20 65 64 69 66 66 | 2d 6f 76 65 72 6c 61 79 |rl ediff|-overlay|
|00004440| 2d 67 65 74 20 65 64 69 | 66 66 2d 6d 65 74 61 2d |-get edi|ff-meta-|
|00004450| 69 6e 66 6f 20 73 65 73 | 73 69 6f 6e 2d 69 6e 66 |info ses|sion-inf|
|00004460| 6f 20 65 64 69 66 66 2d | 67 65 74 2d 73 65 73 73 |o ediff-|get-sess|
|00004470| 69 6f 6e 2d 61 63 74 69 | 76 69 74 79 2d 6d 61 72 |ion-acti|vity-mar|
|00004480| 6b 65 72 20 61 63 74 69 | 76 69 74 79 2d 6d 61 72 |ker acti|vity-mar|
|00004490| 6b 65 72 20 6e 69 6c 20 | 62 75 66 66 65 72 2d 72 |ker nil |buffer-r|
|000044a0| 65 61 64 2d 6f 6e 6c 79 | 20 6e 65 77 2d 6d 61 72 |ead-only| new-mar|
|000044b0| 6b 65 72 20 3f 5c 20 20 | 65 64 69 66 66 2d 6f 76 |ker ?\ |ediff-ov|
|000044c0| 65 72 6c 61 79 70 20 65 | 64 69 66 66 2d 65 6d 61 |erlayp e|diff-ema|
|000044d0| 63 73 2d 70 20 6f 76 65 | 72 6c 61 79 2d 73 74 61 |cs-p ove|rlay-sta|
|000044e0| 72 74 20 65 78 74 65 6e | 74 2d 73 74 61 72 74 2d |rt exten|t-start-|
|000044f0| 70 6f 73 69 74 69 6f 6e | 20 64 65 6c 65 74 65 2d |position| delete-|
|00004500| 63 68 61 72 20 31 20 73 | 65 74 2d 62 75 66 66 65 |char 1 s|et-buffe|
|00004510| 72 2d 6d 6f 64 69 66 69 | 65 64 2d 70 5d 20 33 5d |r-modifi|ed-p] 3]|
|00004520| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00004530| 66 66 2d 72 65 70 6c 61 | 63 65 2d 73 65 73 73 69 |ff-repla|ce-sessi|
|00004540| 6f 6e 2d 73 74 61 74 75 | 73 2d 69 6e 2d 6d 65 74 |on-statu|s-in-met|
|00004550| 61 2d 62 75 66 66 65 72 | 20 23 5b 28 70 6f 69 6e |a-buffer| #[(poin|
|00004560| 74 20 6e 65 77 2d 73 74 | 61 74 75 73 29 20 22 c0 |t new-st|atus) ".|
|00004570| 09 21 1a c3 5c 6e c4 5c | 22 89 1d 89 1e 06 41 40 |.!..\n.\|".....A@|
|00004580| 29 1e 07 c8 1e 09 0e 5c | 6e ae 85 0e 07 ae 81 cb |)......\|n.......|
|00004590| 16 5c 6e 5c 6e 1a cc 5c | 6e 21 ad 8c 0e 0d ab 85 |.\n\n..\|n!......|
|000045a0| ce 5c 6e 21 aa 83 cf 5c | 6e 21 29 62 88 d0 75 88 |.\n!...\|n!)b..u.|
|000045b0| 60 66 0e 5c 6e 61 3f ad | 8b 0e 5c 6e 63 88 d1 d0 |`f.\na?.|..\nc...|
|000045c0| 21 88 d2 c8 21 2c 87 22 | 20 5b 65 64 69 66 66 2d |!...!,."| [ediff-|
|000045d0| 67 65 74 2d 6d 65 74 61 | 2d 6f 76 65 72 6c 61 79 |get-meta|-overlay|
|000045e0| 2d 61 74 2d 70 6f 73 20 | 70 6f 69 6e 74 20 6f 76 |-at-pos |point ov|
|000045f0| 65 72 6c 20 65 64 69 66 | 66 2d 6f 76 65 72 6c 61 |erl edif|f-overla|
|00004600| 79 2d 67 65 74 20 65 64 | 69 66 66 2d 6d 65 74 61 |y-get ed|iff-meta|
|00004610| 2d 69 6e 66 6f 20 73 65 | 73 73 69 6f 6e 2d 69 6e |-info se|ssion-in|
|00004620| 66 6f 20 65 6c 74 20 73 | 74 61 74 75 73 20 6e 69 |fo elt s|tatus ni|
|00004630| 6c 20 62 75 66 66 65 72 | 2d 72 65 61 64 2d 6f 6e |l buffer|-read-on|
|00004640| 6c 79 20 6e 65 77 2d 73 | 74 61 74 75 73 20 3f 5c |ly new-s|tatus ?\|
|00004650| 20 20 65 64 69 66 66 2d | 6f 76 65 72 6c 61 79 70 | ediff-|overlayp|
|00004660| 20 65 64 69 66 66 2d 65 | 6d 61 63 73 2d 70 20 6f | ediff-e|macs-p o|
|00004670| 76 65 72 6c 61 79 2d 73 | 74 61 72 74 20 65 78 74 |verlay-s|tart ext|
|00004680| 65 6e 74 2d 73 74 61 72 | 74 2d 70 6f 73 69 74 69 |ent-star|t-positi|
|00004690| 6f 6e 20 31 20 64 65 6c | 65 74 65 2d 63 68 61 72 |on 1 del|ete-char|
|000046a0| 20 73 65 74 2d 62 75 66 | 66 65 72 2d 6d 6f 64 69 | set-buf|fer-modi|
|000046b0| 66 69 65 64 2d 70 5d 20 | 34 5d 29 0a 28 64 65 66 |fied-p] |4]).(def|
|000046c0| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 69 6e 73 |alias 'e|diff-ins|
|000046d0| 65 72 74 2d 73 65 73 73 | 69 6f 6e 2d 69 6e 66 6f |ert-sess|ion-info|
|000046e0| 2d 69 6e 2d 6d 65 74 61 | 2d 62 75 66 66 65 72 20 |-in-meta|-buffer |
|000046f0| 23 5b 28 73 65 73 73 69 | 6f 6e 2d 69 6e 66 6f 20 |#[(sessi|on-info |
|00004700| 73 65 73 73 69 6f 6e 4e | 75 6d 29 20 22 08 19 c2 |sessionN|um) "...|
|00004710| 09 38 29 08 19 c3 09 38 | 29 08 19 c4 09 38 29 60 |.8)....8|)....8)`|
|00004720| 08 89 19 41 40 29 c5 61 | 1e 06 1e 07 1e 08 1e 09 |...A@).a|........|
|00004730| 1e 5c 6e cb 08 21 88 cc | 08 21 88 cd ce 0e 0f 21 |.\n..!..|.!.....!|
|00004740| d0 b1 03 88 d1 0e 5c 6e | 21 88 d1 0e 09 21 88 d1 |......\n|!....!..|
|00004750| 0e 08 21 88 d2 0e 07 60 | 08 0e 0f 0e 06 25 2d 87 |..!....`|.....%-.|
|00004760| 22 20 5b 73 65 73 73 69 | 6f 6e 2d 69 6e 66 6f 20 |" [sessi|on-info |
|00004770| 65 6c 74 20 32 20 33 20 | 34 20 3f 49 20 68 69 64 |elt 2 3 |4 ?I hid|
|00004780| 64 65 6e 20 70 74 20 66 | 33 20 66 32 20 66 31 20 |den pt f|3 f2 f1 |
|00004790| 65 64 69 66 66 2d 69 6e | 73 65 72 74 2d 73 65 73 |ediff-in|sert-ses|
|000047a0| 73 69 6f 6e 2d 61 63 74 | 69 76 69 74 79 2d 6d 61 |sion-act|ivity-ma|
|000047b0| 72 6b 65 72 2d 69 6e 2d | 6d 65 74 61 2d 62 75 66 |rker-in-|meta-buf|
|000047c0| 66 65 72 20 65 64 69 66 | 66 2d 69 6e 73 65 72 74 |fer edif|f-insert|
|000047d0| 2d 73 65 73 73 69 6f 6e | 2d 73 74 61 74 75 73 2d |-session|-status-|
|000047e0| 69 6e 2d 6d 65 74 61 2d | 62 75 66 66 65 72 20 22 |in-meta-|buffer "|
|000047f0| 20 20 53 65 73 73 69 6f | 6e 20 22 20 69 6e 74 2d | Sessio|n " int-|
|00004800| 74 6f 2d 73 74 72 69 6e | 67 20 73 65 73 73 69 6f |to-strin|g sessio|
|00004810| 6e 4e 75 6d 20 22 3a 5c | 6e 22 20 65 64 69 66 66 |nNum ":\|n" ediff|
|00004820| 2d 6d 65 74 61 2d 69 6e | 73 65 72 74 2d 66 69 6c |-meta-in|sert-fil|
|00004830| 65 2d 69 6e 66 6f 31 20 | 65 64 69 66 66 2d 73 65 |e-info1 |ediff-se|
|00004840| 74 2d 6d 65 74 61 2d 6f | 76 65 72 6c 61 79 5d 20 |t-meta-o|verlay] |
|00004850| 37 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |7]).(def|alias 'e|
|00004860| 64 69 66 66 2d 72 65 64 | 72 61 77 2d 64 69 72 65 |diff-red|raw-dire|
|00004870| 63 74 6f 72 79 2d 67 72 | 6f 75 70 2d 62 75 66 66 |ctory-gr|oup-buff|
|00004880| 65 72 20 23 5b 28 6d 65 | 74 61 2d 6c 69 73 74 29 |er #[(me|ta-list)|
|00004890| 20 22 08 89 18 40 40 29 | c1 c2 c3 89 89 89 89 89 | "...@@)|........|
|000048a0| 1c 1d 1e 06 1e 07 1e 08 | 1e 09 1e 5c 6e 1e 0b 89 |........|...\n...|
|000048b0| 1e 0c 83 27 01 cd 0e 0c | 21 83 27 01 ce cd 0e 0c |...'....|!.'.....|
|000048c0| 21 21 83 27 01 72 0e 0c | 71 88 60 16 06 cf 20 88 |!!.'.r..|q.`... .|
|000048d0| 0e 10 ab 8a d1 d2 d3 d4 | 89 5c 22 5c 22 88 aa 84 |........|.\"\"...|
|000048e0| d5 d6 21 88 d7 0e 18 d9 | 0e 1a 21 5c 22 63 88 08 |..!.....|..!\"c..|
|000048f0| 89 18 40 41 40 29 16 09 | 08 18 db 08 40 38 29 16 |..@A@)..|....@8).|
|00004900| 07 c3 1e 1c 0e 1a dd 73 | 29 ab 85 de 63 88 aa 8d |.......s|)...c...|
|00004910| c3 1e 1c 0e 1a df 73 29 | ab 83 e0 63 88 e1 63 88 |......s)|...c..c.|
|00004920| e2 20 ac 85 e3 e4 b1 02 | 88 e5 63 88 0e 09 3b ab |. ......|..c...;.|
|00004930| 8e 0e 09 47 c2 56 ab 87 | d7 e6 0e 09 5c 22 63 88 |...G.V..|....\"c.|
|00004940| e7 08 21 88 0e 28 ab 96 | c3 1e 1c 0e 1a e9 73 29 |..!..(..|......s)|
|00004950| ab 8c 0e 07 3b ab 87 d7 | ea 0e 07 5c 22 63 88 eb |....;...|...\"c..|
|00004960| 63 88 08 41 89 10 89 15 | ab 9d 0e 0b ab 99 0d 40 |c..A....|.......@|
|00004970| ab 8f 0d 40 89 1e 08 41 | 40 29 ec 61 ac 83 c3 16 |...@...A|@).a....|
|00004980| 0b 0d 41 89 15 ac 63 0e | 0b ab 83 ed 63 88 08 ab |..A...c.|....c...|
|00004990| a1 08 40 16 08 08 41 10 | 0e 5c 6e 54 16 5c 6e 0e |..@...A.|.\nT.\n.|
|000049a0| 08 89 1e 08 41 40 29 ec | 61 ac 65 ee 0e 08 0e 5c |....A@).|a.e....\|
|000049b0| 6e 5c 22 88 aa 5c 5c ef | c3 21 88 0e 06 62 88 0e |n\"..\\.|.!...b..|
|000049c0| 0c 29 aa 8a 0e 30 f1 61 | ae 84 f2 0e 33 21 2e 09 |.)...0.a|....3!..|
|000049d0| 87 22 20 5b 6d 65 74 61 | 2d 6c 69 73 74 20 74 20 |." [meta|-list t |
|000049e0| 30 20 6e 69 6c 20 62 75 | 66 66 65 72 2d 72 65 61 |0 nil bu|ffer-rea|
|000049f0| 64 2d 6f 6e 6c 79 20 74 | 6d 70 2d 6c 69 73 74 20 |d-only t|mp-list |
|00004a00| 70 6f 69 6e 74 20 6d 65 | 72 67 65 2d 61 75 74 6f |point me|rge-auto|
|00004a10| 73 74 6f 72 65 2d 64 69 | 72 20 65 6c 74 20 72 65 |store-di|r elt re|
|00004a20| 67 65 78 70 20 73 65 73 | 73 69 6f 6e 4e 75 6d 20 |gexp ses|sionNum |
|00004a30| 65 6d 70 74 79 20 6d 65 | 74 61 2d 62 75 66 20 67 |empty me|ta-buf g|
|00004a40| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00004a50| 2d 6e 61 6d 65 20 65 72 | 61 73 65 2d 62 75 66 66 |-name er|ase-buff|
|00004a60| 65 72 20 65 64 69 66 66 | 2d 65 6d 61 63 73 2d 70 |er ediff|-emacs-p|
|00004a70| 20 6d 61 70 63 61 72 20 | 64 65 6c 65 74 65 2d 6f | mapcar |delete-o|
|00004a80| 76 65 72 6c 61 79 20 6f | 76 65 72 6c 61 79 73 2d |verlay o|verlays-|
|00004a90| 69 6e 20 31 20 6d 61 70 | 2d 65 78 74 65 6e 74 73 |in 1 map|-extents|
|00004aa0| 20 64 65 6c 65 74 65 2d | 65 78 74 65 6e 74 20 66 | delete-|extent f|
|00004ab0| 6f 72 6d 61 74 20 65 64 | 69 66 66 2d 6d 65 74 61 |ormat ed|iff-meta|
|00004ac0| 2d 62 75 66 66 65 72 2d | 6d 65 73 73 61 67 65 20 |-buffer-|message |
|00004ad0| 65 64 69 66 66 2d 61 62 | 62 72 65 76 2d 6a 6f 62 |ediff-ab|brev-job|
|00004ae0| 6e 61 6d 65 20 65 64 69 | 66 66 2d 6d 65 74 61 6a |name edi|ff-metaj|
|00004af0| 6f 62 2d 6e 61 6d 65 20 | 35 20 6d 65 74 61 6a 6f |ob-name |5 metajo|
|00004b00| 62 20 28 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f |b (ediff|-directo|
|00004b10| 72 69 65 73 20 65 64 69 | 66 66 2d 64 69 72 65 63 |ries edi|ff-direc|
|00004b20| 74 6f 72 79 2d 72 65 76 | 69 73 69 6f 6e 73 20 65 |tory-rev|isions e|
|00004b30| 64 69 66 66 2d 6d 65 72 | 67 65 2d 64 69 72 65 63 |diff-mer|ge-direc|
|00004b40| 74 6f 72 69 65 73 20 65 | 64 69 66 66 2d 6d 65 72 |tories e|diff-mer|
|00004b50| 67 65 2d 64 69 72 65 63 | 74 6f 72 69 65 73 2d 77 |ge-direc|tories-w|
|00004b60| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 20 65 64 69 |ith-ance|stor edi|
|00004b70| 66 66 2d 6d 65 72 67 65 | 2d 64 69 72 65 63 74 6f |ff-merge|-directo|
|00004b80| 72 79 2d 72 65 76 69 73 | 69 6f 6e 73 20 65 64 69 |ry-revis|ions edi|
|00004b90| 66 66 2d 6d 65 72 67 65 | 2d 64 69 72 65 63 74 6f |ff-merge|-directo|
|00004ba0| 72 79 2d 72 65 76 69 73 | 69 6f 6e 73 2d 77 69 74 |ry-revis|ions-wit|
|00004bb0| 68 2d 61 6e 63 65 73 74 | 6f 72 29 20 22 20 20 20 |h-ancest|or) " |
|00004bc0| 20 20 50 3a 09 63 6f 6c | 6c 65 63 74 20 63 75 73 | P:.col|lect cus|
|00004bd0| 74 6f 6d 20 64 69 66 66 | 73 20 6f 66 20 61 6c 6c |tom diff|s of all|
|00004be0| 20 6d 61 72 6b 65 64 20 | 73 65 73 73 69 6f 6e 73 | marked |sessions|
|00004bf0| 5c 6e 22 20 28 65 64 69 | 66 66 2d 6d 75 6c 74 69 |\n" (edi|ff-multi|
|00004c00| 66 69 6c 65 2d 70 61 74 | 63 68 29 20 22 20 20 20 |file-pat|ch) " |
|00004c10| 20 20 50 3a 09 73 68 6f | 77 20 70 61 74 63 68 20 | P:.sho|w patch |
|00004c20| 61 70 70 72 6f 70 72 69 | 61 74 65 6c 79 20 66 6f |appropri|ately fo|
|00004c30| 72 20 74 68 65 20 63 6f | 6e 74 65 78 74 20 28 73 |r the co|ntext (s|
|00004c40| 65 73 73 69 6f 6e 20 6f | 72 20 67 72 6f 75 70 29 |ession o|r group)|
|00004c50| 5c 6e 22 20 22 20 20 20 | 20 20 75 3a 09 73 68 6f |\n" " | u:.sho|
|00004c60| 77 20 70 61 72 65 6e 74 | 20 73 65 73 73 69 6f 6e |w parent| session|
|00004c70| 20 67 72 6f 75 70 5c 6e | 22 20 65 64 69 66 66 2d | group\n|" ediff-|
|00004c80| 6f 6e 65 2d 66 69 6c 65 | 67 72 6f 75 70 2d 6d 65 |one-file|group-me|
|00004c90| 74 61 6a 6f 62 20 22 20 | 20 20 20 20 44 3a 09 73 |tajob " | D:.s|
|00004ca0| 68 6f 77 20 64 69 66 66 | 65 72 65 6e 63 65 73 20 |how diff|erences |
|00004cb0| 61 6d 6f 6e 67 20 64 69 | 72 65 63 74 6f 72 69 65 |among di|rectorie|
|00004cc0| 73 5c 6e 22 20 22 20 20 | 20 20 20 3d 3a 09 6d 61 |s\n" " | =:.ma|
|00004cd0| 72 6b 20 69 64 65 6e 74 | 69 63 61 6c 20 66 69 6c |rk ident|ical fil|
|00004ce0| 65 73 20 69 6e 20 65 61 | 63 68 20 73 65 73 73 69 |es in ea|ch sessi|
|00004cf0| 6f 6e 5c 6e 5c 6e 22 20 | 22 5c 6e 22 20 22 2a 2a |on\n\n" |"\n" "**|
|00004d00| 2a 20 46 69 6c 74 65 72 | 2d 74 68 72 6f 75 67 68 |* Filter|-through|
|00004d10| 20 72 65 67 75 6c 61 72 | 20 65 78 70 72 65 73 73 | regular| express|
|00004d20| 69 6f 6e 3a 20 25 73 5c | 6e 22 20 65 64 69 66 66 |ion: %s\|n" ediff|
|00004d30| 2d 69 6e 73 65 72 74 2d | 64 69 72 73 2d 69 6e 2d |-insert-|dirs-in-|
|00004d40| 6d 65 74 61 2d 62 75 66 | 66 65 72 20 65 64 69 66 |meta-buf|fer edif|
|00004d50| 66 2d 61 75 74 6f 73 74 | 6f 72 65 2d 6d 65 72 67 |f-autost|ore-merg|
|00004d60| 65 73 20 28 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |es (edif|f-merge-|
|00004d70| 64 69 72 65 63 74 6f 72 | 69 65 73 20 65 64 69 66 |director|ies edif|
|00004d80| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00004d90| 69 65 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ies-with|-ancesto|
|00004da0| 72 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |r ediff-|merge-di|
|00004db0| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|00004dc0| 73 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |s ediff-|merge-di|
|00004dd0| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|00004de0| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 20 |s-with-a|ncestor |
|00004df0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 66 69 6c 65 |ediff-me|rge-file|
|00004e00| 67 72 6f 75 70 73 2d 77 | 69 74 68 2d 61 6e 63 65 |groups-w|ith-ance|
|00004e10| 73 74 6f 72 29 20 22 5c | 6e 4d 65 72 67 65 20 72 |stor) "\|nMerge r|
|00004e20| 65 73 75 6c 74 73 20 61 | 72 65 20 61 75 74 6f 6d |esults a|re autom|
|00004e30| 61 74 69 63 61 6c 6c 79 | 20 73 74 6f 72 65 64 20 |atically| stored |
|00004e40| 69 6e 3a 5c 6e 09 25 73 | 5c 6e 22 20 22 5c 6e 5c |in:\n.%s|\n" "\n\|
|00004e50| 6e 20 20 20 20 20 20 20 | 20 53 69 7a 65 20 20 20 |n | Size |
|00004e60| 4c 61 73 74 20 6d 6f 64 | 69 66 69 65 64 20 20 20 |Last mod|ified |
|00004e70| 20 20 20 20 20 20 20 20 | 4e 61 6d 65 5c 6e 20 20 | |Name\n |
|00004e80| 20 20 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d | ------|--------|
|00004e90| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00004ea0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00004eb0| 5c 6e 5c 6e 22 20 3f 49 | 20 22 20 20 20 20 20 2a |\n\n" ?I| " *|
|00004ec0| 2a 2a 2a 2a 2a 20 20 20 | 2a 2a 2a 2a 2a 2a 20 20 |***** |****** |
|00004ed0| 20 54 68 69 73 20 73 65 | 73 73 69 6f 6e 20 67 72 | This se|ssion gr|
|00004ee0| 6f 75 70 20 68 61 73 20 | 6e 6f 20 6d 65 6d 62 65 |oup has |no membe|
|00004ef0| 72 73 5c 6e 22 20 65 64 | 69 66 66 2d 69 6e 73 65 |rs\n" ed|iff-inse|
|00004f00| 72 74 2d 73 65 73 73 69 | 6f 6e 2d 69 6e 66 6f 2d |rt-sessi|on-info-|
|00004f10| 69 6e 2d 6d 65 74 61 2d | 62 75 66 66 65 72 20 73 |in-meta-|buffer s|
|00004f20| 65 74 2d 62 75 66 66 65 | 72 2d 6d 6f 64 69 66 69 |et-buffe|r-modifi|
|00004f30| 65 64 2d 70 20 74 68 69 | 73 2d 63 6f 6d 6d 61 6e |ed-p thi|s-comman|
|00004f40| 64 20 65 64 69 66 66 2d | 71 75 69 74 20 65 72 72 |d ediff-|quit err|
|00004f50| 6f 72 20 65 64 69 66 66 | 2d 4b 49 4c 4c 45 44 2d |or ediff|-KILLED-|
|00004f60| 56 49 54 41 4c 2d 42 55 | 46 46 45 52 5d 20 31 30 |VITAL-BU|FFER] 10|
|00004f70| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00004f80| 69 66 66 2d 75 70 64 61 | 74 65 2d 6d 61 72 6b 65 |iff-upda|te-marke|
|00004f90| 72 73 2d 69 6e 2d 64 69 | 72 2d 6d 65 74 61 2d 62 |rs-in-di|r-meta-b|
|00004fa0| 75 66 66 65 72 20 23 5b | 28 6d 65 74 61 2d 6c 69 |uffer #[|(meta-li|
|00004fb0| 73 74 29 20 22 08 89 18 | 40 40 29 c1 89 89 89 1a |st) "...|@@).....|
|00004fc0| 1b 1c 1d 89 1e 06 ab ff | c7 0e 06 21 ab f9 c8 c7 |........|...!....|
|00004fd0| 0e 06 21 21 ab f1 72 0e | 06 71 88 60 14 65 62 88 |..!!..r.|.q.`.eb.|
|00004fe0| c9 20 88 6f ac d7 ca 0e | 06 60 cb 23 15 cc 60 21 |. .o....|.`.#..`!|
|00004ff0| 13 0d ab c4 0d 89 1e 0d | 41 40 29 ce 61 ab 8b 0b |........|A@).a...|
|00005000| ab b6 cf 0b d0 d1 23 88 | aa ae 0d 89 1e 0d 41 40 |......#.|......A@|
|00005010| 29 d2 61 ab 91 0b ab 8e | d3 0b d0 5c 22 ab 88 cf |).a.....|...\"...|
|00005020| 0b d0 c1 23 88 aa 92 d4 | 60 d5 0d 21 5c 22 88 d6 |...#....|`..!\"..|
|00005030| 60 0d 89 1e 0d 41 40 29 | 5c 22 88 c9 20 88 aa 26 |`....A@)|\".. ..&|
|00005040| d7 c1 21 88 0c 62 88 29 | aa 8b 0e 18 d9 61 ac 85 |..!..b.)|.....a..|
|00005050| da 0e 1b 21 88 0e 06 2d | 87 22 20 5b 6d 65 74 61 |...!...-|." [meta|
|00005060| 2d 6c 69 73 74 20 6e 69 | 6c 20 62 75 66 66 65 72 |-list ni|l buffer|
|00005070| 2d 72 65 61 64 2d 6f 6e | 6c 79 20 6f 76 65 72 6c |-read-on|ly overl|
|00005080| 20 70 6f 69 6e 74 20 73 | 65 73 73 69 6f 6e 2d 69 | point s|ession-i|
|00005090| 6e 66 6f 20 6d 65 74 61 | 2d 62 75 66 20 67 65 74 |nfo meta|-buf get|
|000050a0| 2d 62 75 66 66 65 72 20 | 62 75 66 66 65 72 2d 6e |-buffer |buffer-n|
|000050b0| 61 6d 65 20 65 64 69 66 | 66 2d 6e 65 78 74 2d 6d |ame edif|f-next-m|
|000050c0| 65 74 61 2d 69 74 65 6d | 31 20 65 64 69 66 66 2d |eta-item|1 ediff-|
|000050d0| 67 65 74 2d 6d 65 74 61 | 2d 69 6e 66 6f 20 6e 6f |get-meta|-info no|
|000050e0| 2d 65 72 72 6f 72 20 65 | 64 69 66 66 2d 67 65 74 |-error e|diff-get|
|000050f0| 2d 6d 65 74 61 2d 6f 76 | 65 72 6c 61 79 2d 61 74 |-meta-ov|erlay-at|
|00005100| 2d 70 6f 73 20 65 6c 74 | 20 3f 49 20 65 64 69 66 |-pos elt| ?I edif|
|00005110| 66 2d 6f 76 65 72 6c 61 | 79 2d 70 75 74 20 69 6e |f-overla|y-put in|
|00005120| 76 69 73 69 62 6c 65 20 | 74 20 3f 48 20 65 64 69 |visible |t ?H edi|
|00005130| 66 66 2d 6f 76 65 72 6c | 61 79 2d 67 65 74 20 65 |ff-overl|ay-get e|
|00005140| 64 69 66 66 2d 72 65 70 | 6c 61 63 65 2d 73 65 73 |diff-rep|lace-ses|
|00005150| 73 69 6f 6e 2d 61 63 74 | 69 76 69 74 79 2d 6d 61 |sion-act|ivity-ma|
|00005160| 72 6b 65 72 2d 69 6e 2d | 6d 65 74 61 2d 62 75 66 |rker-in-|meta-buf|
|00005170| 66 65 72 20 65 64 69 66 | 66 2d 67 65 74 2d 73 65 |fer edif|f-get-se|
|00005180| 73 73 69 6f 6e 2d 61 63 | 74 69 76 69 74 79 2d 6d |ssion-ac|tivity-m|
|00005190| 61 72 6b 65 72 20 65 64 | 69 66 66 2d 72 65 70 6c |arker ed|iff-repl|
|000051a0| 61 63 65 2d 73 65 73 73 | 69 6f 6e 2d 73 74 61 74 |ace-sess|ion-stat|
|000051b0| 75 73 2d 69 6e 2d 6d 65 | 74 61 2d 62 75 66 66 65 |us-in-me|ta-buffe|
|000051c0| 72 20 73 65 74 2d 62 75 | 66 66 65 72 2d 6d 6f 64 |r set-bu|ffer-mod|
|000051d0| 69 66 69 65 64 2d 70 20 | 74 68 69 73 2d 63 6f 6d |ified-p |this-com|
|000051e0| 6d 61 6e 64 20 65 64 69 | 66 66 2d 71 75 69 74 20 |mand edi|ff-quit |
|000051f0| 65 72 72 6f 72 20 65 64 | 69 66 66 2d 4b 49 4c 4c |error ed|iff-KILL|
|00005200| 45 44 2d 56 49 54 41 4c | 2d 42 55 46 46 45 52 5d |ED-VITAL|-BUFFER]|
|00005210| 20 36 5d 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 | 6]).(de|falias '|
|00005220| 65 64 69 66 66 2d 75 70 | 64 61 74 65 2d 73 65 73 |ediff-up|date-ses|
|00005230| 73 69 6f 6e 2d 6d 61 72 | 6b 65 72 2d 69 6e 2d 64 |sion-mar|ker-in-d|
|00005240| 69 72 2d 6d 65 74 61 2d | 62 75 66 66 65 72 20 23 |ir-meta-|buffer #|
|00005250| 5b 28 73 65 73 73 69 6f | 6e 2d 6e 75 6d 29 20 22 |[(sessio|n-num) "|
|00005260| c0 89 89 89 19 1a 1b 1c | 0d ab 85 c6 c7 21 aa 92 |........|.....!..|
|00005270| c8 20 14 c9 0c 40 0c 41 | 5c 22 14 ca c0 cb cc 0c |. ...@.A|\"......|
|00005280| 5c 22 5c 22 40 89 12 ac | 86 cd ce 0e 0f 5c 22 88 |\"\"@...|.....\".|
|00005290| d0 5c 6e d1 5c 22 13 5c | 6e 1a d2 5c 6e 21 ad 8c |.\n.\".\|n..\n!..|
|000052a0| 0e 13 ab 85 d4 5c 6e 21 | aa 83 d5 5c 6e 21 29 62 |.....\n!|...\n!)b|
|000052b0| 88 d6 60 d7 0b 21 5c 22 | 88 d8 60 0b 89 1e 19 41 |..`..!\"|..`....A|
|000052c0| 40 29 5c 22 88 2c da 20 | 87 22 20 5b 6e 69 6c 20 |@)\".,. |." [nil |
|000052d0| 62 75 66 66 65 72 2d 72 | 65 61 64 2d 6f 6e 6c 79 |buffer-r|ead-only|
|000052e0| 20 6f 76 65 72 6c 20 73 | 65 73 73 69 6f 6e 2d 69 | overl s|ession-i|
|000052f0| 6e 66 6f 20 62 75 66 66 | 65 72 2d 6d 65 74 61 2d |nfo buff|er-meta-|
|00005300| 6f 76 65 72 6c 61 79 73 | 20 65 64 69 66 66 2d 78 |overlays| ediff-x|
|00005310| 65 6d 61 63 73 2d 70 20 | 6d 61 70 2d 65 78 74 65 |emacs-p |map-exte|
|00005320| 6e 74 73 20 23 5b 28 65 | 78 74 20 6d 61 70 61 72 |nts #[(e|xt mapar|
|00005330| 67 29 20 22 c0 09 c2 5c | 22 ad 89 c0 09 c3 5c 22 |g) "...\|".....\"|
|00005340| 0c 61 ad 81 09 87 22 20 | 5b 65 64 69 66 66 2d 6f |.a...." |[ediff-o|
|00005350| 76 65 72 6c 61 79 2d 67 | 65 74 20 65 78 74 20 65 |verlay-g|et ext e|
|00005360| 64 69 66 66 2d 6d 65 74 | 61 2d 69 6e 66 6f 20 65 |diff-met|a-info e|
|00005370| 64 69 66 66 2d 6d 65 74 | 61 2d 73 65 73 73 69 6f |diff-met|a-sessio|
|00005380| 6e 2d 6e 75 6d 62 65 72 | 20 73 65 73 73 69 6f 6e |n-number| session|
|00005390| 2d 6e 75 6d 5d 20 33 5d | 20 6f 76 65 72 6c 61 79 |-num] 3]| overlay|
|000053a0| 2d 6c 69 73 74 73 20 61 | 70 70 65 6e 64 20 64 65 |-lists a|ppend de|
|000053b0| 6c 71 20 6d 61 70 63 61 | 72 20 23 5b 28 6f 76 65 |lq mapca|r #[(ove|
|000053c0| 72 6c 29 20 22 c0 09 c2 | 5c 22 ad 89 c0 09 c3 5c |rl) "...|\".....\|
|000053d0| 22 0c 61 ad 81 09 87 22 | 20 5b 65 64 69 66 66 2d |".a...."| [ediff-|
|000053e0| 6f 76 65 72 6c 61 79 2d | 67 65 74 20 6f 76 65 72 |overlay-|get over|
|000053f0| 6c 20 65 64 69 66 66 2d | 6d 65 74 61 2d 69 6e 66 |l ediff-|meta-inf|
|00005400| 6f 20 65 64 69 66 66 2d | 6d 65 74 61 2d 73 65 73 |o ediff-|meta-ses|
|00005410| 73 69 6f 6e 2d 6e 75 6d | 62 65 72 20 73 65 73 73 |sion-num|ber sess|
|00005420| 69 6f 6e 2d 6e 75 6d 5d | 20 33 5d 20 65 72 72 6f |ion-num]| 3] erro|
|00005430| 72 20 22 42 75 67 20 69 | 6e 20 65 64 69 66 66 2d |r "Bug i|n ediff-|
|00005440| 75 70 64 61 74 65 2d 73 | 65 73 73 69 6f 6e 2d 6d |update-s|ession-m|
|00005450| 61 72 6b 65 72 2d 69 6e | 2d 64 69 72 2d 6d 65 74 |arker-in|-dir-met|
|00005460| 61 2d 62 75 66 66 65 72 | 3a 20 6e 6f 20 6f 76 65 |a-buffer|: no ove|
|00005470| 72 6c 61 79 20 77 69 74 | 68 20 67 69 76 65 6e 20 |rlay wit|h given |
|00005480| 6e 75 6d 62 65 72 20 25 | 53 22 20 73 65 73 73 69 |number %|S" sessi|
|00005490| 6f 6e 2d 6e 75 6d 20 65 | 64 69 66 66 2d 6f 76 65 |on-num e|diff-ove|
|000054a0| 72 6c 61 79 2d 67 65 74 | 20 65 64 69 66 66 2d 6d |rlay-get| ediff-m|
|000054b0| 65 74 61 2d 69 6e 66 6f | 20 65 64 69 66 66 2d 6f |eta-info| ediff-o|
|000054c0| 76 65 72 6c 61 79 70 20 | 65 64 69 66 66 2d 65 6d |verlayp |ediff-em|
|000054d0| 61 63 73 2d 70 20 6f 76 | 65 72 6c 61 79 2d 73 74 |acs-p ov|erlay-st|
|000054e0| 61 72 74 20 65 78 74 65 | 6e 74 2d 73 74 61 72 74 |art exte|nt-start|
|000054f0| 2d 70 6f 73 69 74 69 6f | 6e 20 65 64 69 66 66 2d |-positio|n ediff-|
|00005500| 72 65 70 6c 61 63 65 2d | 73 65 73 73 69 6f 6e 2d |replace-|session-|
|00005510| 61 63 74 69 76 69 74 79 | 2d 6d 61 72 6b 65 72 2d |activity|-marker-|
|00005520| 69 6e 2d 6d 65 74 61 2d | 62 75 66 66 65 72 20 65 |in-meta-|buffer e|
|00005530| 64 69 66 66 2d 67 65 74 | 2d 73 65 73 73 69 6f 6e |diff-get|-session|
|00005540| 2d 61 63 74 69 76 69 74 | 79 2d 6d 61 72 6b 65 72 |-activit|y-marker|
|00005550| 20 65 64 69 66 66 2d 72 | 65 70 6c 61 63 65 2d 73 | ediff-r|eplace-s|
|00005560| 65 73 73 69 6f 6e 2d 73 | 74 61 74 75 73 2d 69 6e |ession-s|tatus-in|
|00005570| 2d 6d 65 74 61 2d 62 75 | 66 66 65 72 20 65 6c 74 |-meta-bu|ffer elt|
|00005580| 20 65 64 69 66 66 2d 6e | 65 78 74 2d 6d 65 74 61 | ediff-n|ext-meta|
|00005590| 2d 69 74 65 6d 31 5d 20 | 36 5d 29 0a 28 64 65 66 |-item1] |6]).(def|
|000055a0| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 70 72 6f |alias 'e|diff-pro|
|000055b0| 62 6c 65 6d 61 74 69 63 | 2d 73 65 73 73 69 6f 6e |blematic|-session|
|000055c0| 2d 70 20 23 5b 28 73 65 | 73 73 69 6f 6e 29 20 22 |-p #[(se|ssion) "|
|000055d0| 08 19 c2 09 38 40 29 08 | 19 c3 09 38 40 29 08 19 |....8@).|...8@)..|
|000055e0| c4 09 38 40 29 1d 1e 06 | 89 1e 07 3b ab a7 c8 0e |..8@)...|...;....|
|000055f0| 07 21 ac a1 0e 06 3b ab | 9c c8 0e 06 21 ac 96 0d |.!....;.|....!...|
|00005600| 3b ab 85 c8 0d 21 ab 8d | c9 1e 5c 6e 0e 0b cc 73 |;....!..|..\n...s|
|00005610| 29 ab 83 cd aa 81 c9 2b | 87 22 20 5b 73 65 73 73 |)......+|." [sess|
|00005620| 69 6f 6e 20 65 6c 74 20 | 32 20 33 20 34 20 66 33 |ion elt |2 3 4 f3|
|00005630| 20 66 32 20 66 31 20 66 | 69 6c 65 2d 64 69 72 65 | f2 f1 f|ile-dire|
|00005640| 63 74 6f 72 79 2d 70 20 | 6e 69 6c 20 6d 65 74 61 |ctory-p |nil meta|
|00005650| 6a 6f 62 20 65 64 69 66 | 66 2d 6d 65 74 61 6a 6f |job edif|f-metajo|
|00005660| 62 2d 6e 61 6d 65 20 28 | 65 64 69 66 66 2d 6d 65 |b-name (|ediff-me|
|00005670| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 69 65 73 2d |rge-dire|ctories-|
|00005680| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 20 65 64 |with-anc|estor ed|
|00005690| 69 66 66 2d 6d 65 72 67 | 65 2d 66 69 6c 65 67 72 |iff-merg|e-filegr|
|000056a0| 6f 75 70 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |oups-wit|h-ancest|
|000056b0| 6f 72 29 20 61 6e 63 65 | 73 74 6f 72 2d 69 73 2d |or) ance|stor-is-|
|000056c0| 64 69 72 5d 20 35 5d 29 | 0a 28 64 65 66 61 6c 69 |dir] 5])|.(defali|
|000056d0| 61 73 20 27 65 64 69 66 | 66 2d 6d 65 74 61 2d 69 |as 'edif|f-meta-i|
|000056e0| 6e 73 65 72 74 2d 66 69 | 6c 65 2d 69 6e 66 6f 31 |nsert-fi|le-info1|
|000056f0| 20 23 5b 28 66 69 6c 65 | 69 6e 66 6f 29 20 22 08 | #[(file|info) ".|
|00005700| 40 08 89 19 41 40 29 5c | 6e ab 86 c3 20 c4 5a aa |@...A@)\|n... .Z.|
|00005710| 81 c5 c6 89 1e 07 1e 08 | 1e 09 1e 5c 6e 89 1e 0b |........|...\n...|
|00005720| 3b ac 85 cc 16 07 aa ae | cd 0e 0b 21 ac a5 ce 0e |;.......|...!....|
|00005730| 0b 21 ab 9a 0e 0b 1e 0f | d0 0e 0f d1 5c 22 29 16 |.!......|....\").|
|00005740| 07 0e 0b 1e 0f d0 0e 0f | d2 5c 22 29 16 08 aa 88 |........|.\")....|
|00005750| cc 16 07 aa 83 d3 16 07 | 0e 0b 3b ad d1 d4 d5 0e |........|..;.....|
|00005760| 5c 6e ab 83 d6 aa 81 d7 | d4 d8 0e 07 d3 55 ab 83 |\n......|.....U..|
|00005770| d9 aa 8b 0e 07 d3 57 ab | 83 d9 aa 82 0e 07 5c 22 |......W.|......\"|
|00005780| 0e 07 d3 55 ab 83 da aa | 8f 0e 07 d3 57 ab 83 db |...U....|....W...|
|00005790| aa 86 dc dd 0e 08 21 21 | 0e 0b 3b ac 89 0e 07 d3 |......!!|..;.....|
|000057a0| 57 ab 83 de aa 88 df e0 | 0e 0b 21 0e 09 5c 22 25 |W.......|..!..\"%|
|000057b0| 63 2d 87 22 20 5b 66 69 | 6c 65 69 6e 66 6f 20 65 |c-." [fi|leinfo e|
|000057c0| 6c 74 20 65 64 69 66 66 | 2d 6d 65 74 61 2d 74 72 |lt ediff|-meta-tr|
|000057d0| 75 6e 63 61 74 65 2d 66 | 69 6c 65 6e 61 6d 65 73 |uncate-f|ilenames|
|000057e0| 20 77 69 6e 64 6f 77 2d | 77 69 64 74 68 20 34 31 | window-|width 41|
|000057f0| 20 35 30 30 20 6e 69 6c | 20 66 69 6c 65 2d 73 69 | 500 nil| file-si|
|00005800| 7a 65 20 66 69 6c 65 2d | 6d 6f 64 74 69 6d 65 20 |ze file-|modtime |
|00005810| 6d 61 78 2d 66 69 6c 65 | 6e 61 6d 65 2d 77 69 64 |max-file|name-wid|
|00005820| 74 68 20 66 65 71 20 66 | 6e 61 6d 65 20 2d 32 20 |th feq f|name -2 |
|00005830| 65 64 69 66 66 2d 66 69 | 6c 65 2d 72 65 6d 6f 74 |ediff-fi|le-remot|
|00005840| 65 2d 70 20 66 69 6c 65 | 2d 65 78 69 73 74 73 2d |e-p file|-exists-|
|00005850| 70 20 66 69 6c 65 6e 61 | 6d 65 20 65 64 69 66 66 |p filena|me ediff|
|00005860| 2d 66 69 6c 65 2d 61 74 | 74 72 69 62 75 74 65 73 |-file-at|tributes|
|00005870| 20 37 20 35 20 2d 31 20 | 66 6f 72 6d 61 74 20 22 | 7 5 -1 |format "|
|00005880| 25 73 20 20 25 73 20 20 | 20 25 2d 32 30 73 20 20 |%s %s | %-20s |
|00005890| 20 25 73 5c 6e 22 20 22 | 3d 22 20 22 20 22 20 22 | %s\n" "|=" " " "|
|000058a0| 25 31 30 73 22 20 22 2d | 2d 22 20 22 2a 72 65 6d |%10s" "-|-" "*rem|
|000058b0| 6f 74 65 20 66 69 6c 65 | 2a 22 20 22 2a 66 69 6c |ote file|*" "*fil|
|000058c0| 65 20 64 6f 65 73 6e 27 | 74 20 65 78 69 73 74 2a |e doesn'|t exist*|
|000058d0| 22 20 65 64 69 66 66 2d | 66 6f 72 6d 61 74 2d 64 |" ediff-|format-d|
|000058e0| 61 74 65 20 64 65 63 6f | 64 65 2d 74 69 6d 65 20 |ate deco|de-time |
|000058f0| 22 2d 2d 2d 2d 2d 2d 2d | 22 20 65 64 69 66 66 2d |"-------|" ediff-|
|00005900| 74 72 75 6e 63 61 74 65 | 2d 73 74 72 69 6e 67 2d |truncate|-string-|
|00005910| 6c 65 66 74 20 65 64 69 | 66 66 2d 61 62 62 72 65 |left edi|ff-abbre|
|00005920| 76 69 61 74 65 2d 66 69 | 6c 65 2d 6e 61 6d 65 5d |viate-fi|le-name]|
|00005930| 20 39 5d 29 0a 23 40 32 | 38 20 4d 6f 6e 74 68 73 | 9]).#@2|8 Months|
|00005940| 27 20 61 73 73 6f 63 69 | 61 74 69 76 65 20 61 72 |' associ|ative ar|
|00005950| 72 61 79 2e 1f 0a 28 64 | 65 66 63 6f 6e 73 74 20 |ray...(d|efconst |
|00005960| 65 64 69 66 66 2d 6d 6f | 6e 74 68 73 20 27 28 28 |ediff-mo|nths '((|
|00005970| 31 20 2e 20 22 4a 61 6e | 22 29 20 28 32 20 2e 20 |1 . "Jan|") (2 . |
|00005980| 22 46 65 62 22 29 20 28 | 33 20 2e 20 22 4d 61 72 |"Feb") (|3 . "Mar|
|00005990| 22 29 20 28 34 20 2e 20 | 22 41 70 72 22 29 20 28 |") (4 . |"Apr") (|
|000059a0| 35 20 2e 20 22 4d 61 79 | 22 29 20 28 36 20 2e 20 |5 . "May|") (6 . |
|000059b0| 22 4a 75 6e 22 29 20 28 | 37 20 2e 20 22 4a 75 6c |"Jun") (|7 . "Jul|
|000059c0| 22 29 20 28 38 20 2e 20 | 22 41 75 67 22 29 20 28 |") (8 . |"Aug") (|
|000059d0| 39 20 2e 20 22 53 65 70 | 22 29 20 28 31 30 20 2e |9 . "Sep|") (10 .|
|000059e0| 20 22 4f 63 74 22 29 20 | 28 31 31 20 2e 20 22 4e | "Oct") |(11 . "N|
|000059f0| 6f 76 22 29 20 28 31 32 | 20 2e 20 22 44 65 63 22 |ov") (12| . "Dec"|
|00005a00| 29 29 20 28 23 24 20 2e | 20 32 32 38 34 32 29 29 |)) (#$ .| 22842))|
|00005a10| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00005a20| 66 2d 66 69 6c 6c 2d 6c | 65 61 64 69 6e 67 2d 7a |f-fill-l|eading-z|
|00005a30| 65 72 6f 20 23 5b 28 6e | 75 6d 29 20 22 08 c1 57 |ero #[(n|um) "..W|
|00005a40| ab 85 c2 c3 08 5c 22 87 | c4 08 21 87 22 20 5b 6e |.....\".|..!." [n|
|00005a50| 75 6d 20 31 30 20 66 6f | 72 6d 61 74 20 22 30 25 |um 10 fo|rmat "0%|
|00005a60| 64 22 20 6e 75 6d 62 65 | 72 2d 74 6f 2d 73 74 72 |d" numbe|r-to-str|
|00005a70| 69 6e 67 5d 20 33 5d 29 | 0a 28 62 79 74 65 2d 63 |ing] 3])|.(byte-c|
|00005a80| 6f 64 65 20 22 c0 c1 4e | c2 73 ac 85 c3 c4 c0 5c |ode "..N|.s.....\|
|00005a90| 22 88 c5 c0 c1 c6 23 87 | 22 20 5b 65 64 69 66 66 |".....#.|" [ediff|
|00005aa0| 2d 66 69 6c 6c 2d 6c 65 | 61 64 69 6e 67 2d 7a 65 |-fill-le|ading-ze|
|00005ab0| 72 6f 20 62 79 74 65 2d | 6f 70 74 69 6d 69 7a 65 |ro byte-|optimize|
|00005ac0| 72 20 28 6e 69 6c 20 62 | 79 74 65 2d 63 6f 6d 70 |r (nil b|yte-comp|
|00005ad0| 69 6c 65 2d 69 6e 6c 69 | 6e 65 2d 65 78 70 61 6e |ile-inli|ne-expan|
|00005ae0| 64 29 20 65 72 72 6f 72 | 20 22 25 73 20 61 6c 72 |d) error| "%s alr|
|00005af0| 65 61 64 79 20 68 61 73 | 20 61 20 62 79 74 65 2d |eady has| a byte-|
|00005b00| 6f 70 74 69 6d 69 7a 65 | 72 2c 20 63 61 6e 27 74 |optimize|r, can't|
|00005b10| 20 6d 61 6b 65 20 69 74 | 20 69 6e 6c 69 6e 65 22 | make it| inline"|
|00005b20| 20 70 75 74 20 62 79 74 | 65 2d 63 6f 6d 70 69 6c | put byt|e-compil|
|00005b30| 65 2d 69 6e 6c 69 6e 65 | 2d 65 78 70 61 6e 64 5d |e-inline|-expand]|
|00005b40| 20 34 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 | 4).(def|alias 'e|
|00005b50| 64 69 66 66 2d 66 6f 72 | 6d 61 74 2d 64 61 74 65 |diff-for|mat-date|
|00005b60| 20 23 5b 28 74 69 6d 65 | 29 20 22 c0 c1 c2 c3 0c | #[(time|) ".....|
|00005b70| 38 0d 5c 22 41 c6 0c 38 | c7 0c 38 c8 0c 38 89 1e |8.\"A..8|..8..8..|
|00005b80| 09 ca 57 ab 87 c0 cb 0e | 09 5c 22 aa 84 cc 0e 09 |..W.....|.\".....|
|00005b90| 21 29 0c 41 40 89 1e 09 | ca 57 ab 87 c0 cb 0e 09 |!).A@...|.W......|
|00005ba0| 5c 22 aa 84 cc 0e 09 21 | 29 0c 40 89 1e 09 ca 57 |\".....!|).@....W|
|00005bb0| ab 87 c0 cb 0e 09 5c 22 | aa 84 cc 0e 09 21 29 26 |......\"|.....!)&|
|00005bc0| 07 87 22 20 5b 66 6f 72 | 6d 61 74 20 22 25 73 20 |.." [for|mat "%s |
|00005bd0| 25 32 64 20 25 34 64 20 | 25 73 3a 25 73 3a 25 73 |%2d %4d |%s:%s:%s|
|00005be0| 22 20 61 73 73 6f 63 20 | 34 20 74 69 6d 65 20 65 |" assoc |4 time e|
|00005bf0| 64 69 66 66 2d 6d 6f 6e | 74 68 73 20 33 20 35 20 |diff-mon|ths 3 5 |
|00005c00| 32 20 6e 75 6d 20 31 30 | 20 22 30 25 64 22 20 6e |2 num 10| "0%d" n|
|00005c10| 75 6d 62 65 72 2d 74 6f | 2d 73 74 72 69 6e 67 5d |umber-to|-string]|
|00005c20| 20 31 31 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 | 11]).(d|efalias |
|00005c30| 27 65 64 69 66 66 2d 69 | 6e 73 65 72 74 2d 64 69 |'ediff-i|nsert-di|
|00005c40| 72 73 2d 69 6e 2d 6d 65 | 74 61 2d 62 75 66 66 65 |rs-in-me|ta-buffe|
|00005c50| 72 20 23 5b 28 6d 65 74 | 61 2d 6c 69 73 74 29 20 |r #[(met|a-list) |
|00005c60| 22 c0 09 19 c2 09 40 38 | 29 21 1b 09 19 c4 09 40 |".....@8|)!.....@|
|00005c70| 38 29 89 1d 3b ad 83 c0 | 0d 21 1d 09 19 c6 09 40 |8)..;...|.!.....@|
|00005c80| 38 29 89 1e 07 3b ad 84 | c0 0e 07 21 1e 07 c8 0b |8)...;..|...!....|
|00005c90| c9 b1 03 88 0d ab 86 ca | 0d c9 b1 03 88 0e 07 ab |........|........|
|00005ca0| 87 cb 0e 07 c9 b1 03 88 | c9 63 2d 87 22 20 5b 65 |........|.c-." [e|
|00005cb0| 64 69 66 66 2d 61 62 62 | 72 65 76 69 61 74 65 2d |diff-abb|reviate-|
|00005cc0| 66 69 6c 65 2d 6e 61 6d | 65 20 6d 65 74 61 2d 6c |file-nam|e meta-l|
|00005cd0| 69 73 74 20 32 20 64 69 | 72 31 20 33 20 64 69 72 |ist 2 di|r1 3 dir|
|00005ce0| 32 20 34 20 64 69 72 33 | 20 22 2a 2a 2a 20 44 69 |2 4 dir3| "*** Di|
|00005cf0| 72 65 63 74 6f 72 79 20 | 41 3a 20 22 20 22 5c 6e |rectory |A: " "\n|
|00005d00| 22 20 22 2a 2a 2a 20 44 | 69 72 65 63 74 6f 72 79 |" "*** D|irectory|
|00005d10| 20 42 3a 20 22 20 22 2a | 2a 2a 20 44 69 72 65 63 | B: " "*|** Direc|
|00005d20| 74 6f 72 79 20 43 3a 20 | 22 5d 20 34 5d 29 0a 28 |tory C: |"] 4]).(|
|00005d30| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00005d40| 64 72 61 77 2d 64 69 72 | 2d 64 69 66 66 73 20 23 |draw-dir|-diffs #|
|00005d50| 5b 28 64 69 66 66 2d 6c | 69 73 74 29 20 22 08 ac |[(diff-l|ist) "..|
|00005d60| 84 c1 c2 21 88 c3 c4 c5 | 5c 22 1e 06 08 89 1e 07 |...!....|\"......|
|00005d70| 40 41 40 29 1e 08 c9 08 | 1e 07 ca 0e 07 40 38 29 |@A@)....|.....@8)|
|00005d80| 21 1e 0b c9 08 1e 07 cc | 0e 07 40 38 29 21 1e 0d |!.......|..@8)!..|
|00005d90| 08 1e 07 ce 0e 07 40 38 | 29 89 1e 0f 3b ad 84 c9 |......@8|)...;...|
|00005da0| 0e 0f 21 1e 0f 08 89 1e | 07 40 40 29 1e 10 d1 d2 |..!.....|.@@)....|
|00005db0| d3 5c 22 1e 14 d5 1e 16 | d5 1e 17 d5 1e 18 08 41 |.\".....|.......A|
|00005dc0| 10 d9 0e 06 21 89 16 1a | 83 9e 01 db 0e 1a 21 83 |....!...|......!.|
|00005dd0| 9e 01 dc db 0e 1a 21 21 | 83 9e 01 72 0e 1a 71 88 |......!!|...r..q.|
|00005de0| dd 0e 1e 21 88 df 20 88 | 0e 10 16 20 e1 63 88 e2 |...!.. .|... .c..|
|00005df0| 63 88 0e 08 3b ab 8e 0e | 08 47 e3 56 ab 87 e4 e5 |c...;...|.G.V....|
|00005e00| 0e 08 5c 22 63 88 e6 63 | 88 e4 e7 e8 c9 e9 0e 0b |..\"c..c|........|
|00005e10| 21 21 ea 5c 22 e8 c9 e9 | 0e 0d 21 21 ea 5c 22 23 |!!.\"...|..!!.\"#|
|00005e20| 63 88 0e 0f ab 90 e4 eb | e8 c9 e9 0e 0f 21 21 ea |c.......|.....!!.|
|00005e30| 5c 22 5c 22 63 88 aa 83 | e6 63 88 e4 ec 0e 14 89 |\"\"c...|.c......|
|00005e40| 23 63 88 0e 0f 3b ab 89 | e4 ed 0e 14 5c 22 63 88 |#c...;..|....\"c.|
|00005e50| aa 83 ee 63 88 08 ac 83 | ef 63 88 08 83 95 01 08 |...c....|.c......|
|00005e60| 40 40 16 16 08 40 41 16 | 17 08 41 10 f0 0e 17 ca |@@...@A.|..A.....|
|00005e70| 5c 22 e3 55 ab 9d e4 f1 | e8 c9 f2 0e 0b 0e 16 50 |\".U....|.......P|
|00005e80| 21 ab 86 e9 0e 16 21 aa | 82 0e 16 21 f3 5c 22 5c |!.....!.|...!.\"\|
|00005e90| 22 63 88 aa 86 e4 f1 f4 | 5c 22 63 88 f0 0e 17 cc |"c......|\"c.....|
|00005ea0| 5c 22 e3 55 ab 9d e4 f5 | e8 c9 f2 0e 0d 0e 16 50 |\".U....|.......P|
|00005eb0| 21 ab 86 e9 0e 16 21 aa | 82 0e 16 21 f3 5c 22 5c |!.....!.|...!.\"\|
|00005ec0| 22 63 88 aa 86 e4 f5 f4 | 5c 22 63 88 0e 0f 3b ab |"c......|\"c...;.|
|00005ed0| ac f0 0e 17 f6 5c 22 e3 | 55 ab 9d e4 f7 e8 c9 f2 |.....\".|U.......|
|00005ee0| 0e 0f 0e 16 50 21 ab 86 | e9 0e 16 21 aa 82 0e 16 |....P!..|...!....|
|00005ef0| 21 f3 5c 22 5c 22 63 88 | aa 86 e4 f7 f4 5c 22 63 |!.\"\"c.|.....\"c|
|00005f00| 88 e6 63 88 82 f5 00 f8 | 16 18 f9 d5 21 29 aa 8a |..c.....|....!)..|
|00005f10| 0e 3a fb 61 ae 84 c1 0e | 3c 21 2e 0b 87 22 20 5b |.:.a....|<!..." [|
|00005f20| 64 69 66 66 2d 6c 69 73 | 74 20 65 72 72 6f 72 20 |diff-lis|t error |
|00005f30| 22 4c 6f 73 74 20 64 69 | 66 66 65 72 65 6e 63 65 |"Lost di|fference|
|00005f40| 20 69 6e 66 6f 20 6f 6e | 20 74 68 65 73 65 20 64 | info on| these d|
|00005f50| 69 72 65 63 74 6f 72 69 | 65 73 22 20 65 64 69 66 |irectori|es" edif|
|00005f60| 66 2d 75 6e 69 71 75 65 | 2d 62 75 66 66 65 72 2d |f-unique|-buffer-|
|00005f70| 6e 61 6d 65 20 22 2a 45 | 64 69 66 66 20 46 69 6c |name "*E|diff Fil|
|00005f80| 65 20 47 72 6f 75 70 20 | 44 69 66 66 65 72 65 6e |e Group |Differen|
|00005f90| 63 65 73 22 20 22 2a 22 | 20 62 75 66 2d 6e 61 6d |ces" "*"| buf-nam|
|00005fa0| 65 20 6d 65 74 61 2d 6c | 69 73 74 20 72 65 67 65 |e meta-l|ist rege|
|00005fb0| 78 70 20 65 64 69 66 66 | 2d 61 62 62 72 65 76 69 |xp ediff|-abbrevi|
|00005fc0| 61 74 65 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 32 20 |ate-file|-name 2 |
|00005fd0| 64 69 72 31 20 33 20 64 | 69 72 32 20 34 20 64 69 |dir1 3 d|ir2 4 di|
|00005fe0| 72 33 20 6d 65 74 61 2d | 62 75 66 20 6d 61 6b 65 |r3 meta-|buf make|
|00005ff0| 2d 73 74 72 69 6e 67 20 | 32 36 20 3f 5c 2d 20 75 |-string |26 ?\- u|
|00006000| 6e 64 65 72 6c 69 6e 65 | 20 6e 69 6c 20 66 69 6c |nderline| nil fil|
|00006010| 65 20 63 6f 64 65 20 62 | 75 66 66 65 72 2d 72 65 |e code b|uffer-re|
|00006020| 61 64 2d 6f 6e 6c 79 20 | 67 65 74 2d 62 75 66 66 |ad-only |get-buff|
|00006030| 65 72 2d 63 72 65 61 74 | 65 20 65 64 69 66 66 2d |er-creat|e ediff-|
|00006040| 64 69 72 2d 64 69 66 66 | 73 2d 62 75 66 66 65 72 |dir-diff|s-buffer|
|00006050| 20 67 65 74 2d 62 75 66 | 66 65 72 20 62 75 66 66 | get-buf|fer buff|
|00006060| 65 72 2d 6e 61 6d 65 20 | 75 73 65 2d 6c 6f 63 61 |er-name |use-loca|
|00006070| 6c 2d 6d 61 70 20 65 64 | 69 66 66 2d 64 69 72 2d |l-map ed|iff-dir-|
|00006080| 64 69 66 66 73 2d 62 75 | 66 66 65 72 2d 6d 61 70 |diffs-bu|ffer-map|
|00006090| 20 65 72 61 73 65 2d 62 | 75 66 66 65 72 20 65 64 | erase-b|uffer ed|
|000060a0| 69 66 66 2d 6d 65 74 61 | 2d 62 75 66 66 65 72 20 |iff-meta|-buffer |
|000060b0| 22 09 09 2a 2a 2a 20 44 | 69 72 65 63 74 6f 72 79 |"..*** D|irectory|
|000060c0| 20 44 69 66 66 65 72 65 | 6e 63 65 73 20 2a 2a 2a | Differe|nces ***|
|000060d0| 5c 6e 22 20 22 5c 6e 55 | 73 65 66 75 6c 20 63 6f |\n" "\nU|seful co|
|000060e0| 6d 6d 61 6e 64 73 3a 5c | 6e 20 20 20 20 20 60 71 |mmands:\|n `q|
|000060f0| 27 3a 20 68 69 64 65 20 | 74 68 69 73 20 62 75 66 |': hide |this buf|
|00006100| 66 65 72 5c 6e 20 20 20 | 6e 2c 53 50 43 3a 20 6e |fer\n |n,SPC: n|
|00006110| 65 78 74 20 6c 69 6e 65 | 5c 6e 20 20 20 70 2c 44 |ext line|\n p,D|
|00006120| 45 4c 3a 20 70 72 65 76 | 69 6f 75 73 20 6c 69 6e |EL: prev|ious lin|
|00006130| 65 5c 6e 5c 6e 22 20 30 | 20 66 6f 72 6d 61 74 20 |e\n\n" 0| format |
|00006140| 22 5c 6e 2a 2a 2a 20 46 | 69 6c 74 65 72 2d 74 68 |"\n*** F|ilter-th|
|00006150| 72 6f 75 67 68 20 72 65 | 67 75 6c 61 72 20 65 78 |rough re|gular ex|
|00006160| 70 72 65 73 73 69 6f 6e | 3a 20 25 73 5c 6e 22 20 |pression|: %s\n" |
|00006170| 22 5c 6e 22 20 22 5c 6e | 25 2d 32 37 73 25 2d 32 |"\n" "\n|%-27s%-2|
|00006180| 36 73 22 20 65 64 69 66 | 66 2d 74 72 75 6e 63 61 |6s" edif|f-trunca|
|00006190| 74 65 2d 73 74 72 69 6e | 67 2d 6c 65 66 74 20 66 |te-strin|g-left f|
|000061a0| 69 6c 65 2d 6e 61 6d 65 | 2d 61 73 2d 64 69 72 65 |ile-name|-as-dire|
|000061b0| 63 74 6f 72 79 20 32 35 | 20 22 20 25 2d 32 35 73 |ctory 25| " %-25s|
|000061c0| 5c 6e 22 20 22 25 73 25 | 73 22 20 22 25 73 5c 6e |\n" "%s%|s" "%s\n|
|000061d0| 5c 6e 22 20 22 5c 6e 5c | 6e 22 20 22 5c 6e 09 2a |\n" "\n\|n" "\n.*|
|000061e0| 2a 2a 20 20 4e 6f 20 64 | 69 66 66 65 72 65 6e 63 |** No d|ifferenc|
|000061f0| 65 73 20 20 2a 2a 2a 5c | 6e 22 20 6d 6f 64 20 22 |es ***\|n" mod "|
|00006200| 25 2d 32 37 73 22 20 66 | 69 6c 65 2d 64 69 72 65 |%-27s" f|ile-dire|
|00006210| 63 74 6f 72 79 2d 70 20 | 32 34 20 22 2d 2d 2d 22 |ctory-p |24 "---"|
|00006220| 20 22 25 2d 32 36 73 22 | 20 35 20 22 20 25 2d 32 | "%-26s"| 5 " %-2|
|00006230| 35 73 22 20 74 20 73 65 | 74 2d 62 75 66 66 65 72 |5s" t se|t-buffer|
|00006240| 2d 6d 6f 64 69 66 69 65 | 64 2d 70 20 74 68 69 73 |-modifie|d-p this|
|00006250| 2d 63 6f 6d 6d 61 6e 64 | 20 65 64 69 66 66 2d 71 |-command| ediff-q|
|00006260| 75 69 74 20 65 64 69 66 | 66 2d 4b 49 4c 4c 45 44 |uit edif|f-KILLED|
|00006270| 2d 56 49 54 41 4c 2d 42 | 55 46 46 45 52 5d 20 38 |-VITAL-B|UFFER] 8|
|00006280| 5d 29 0a 23 40 37 32 20 | 42 75 72 79 20 74 68 65 |]).#@72 |Bury the|
|00006290| 20 64 69 72 65 63 74 6f | 72 79 20 64 69 66 66 65 | directo|ry diffe|
|000062a0| 72 65 6e 63 65 20 62 75 | 66 66 65 72 2e 20 44 69 |rence bu|ffer. Di|
|000062b0| 73 70 6c 61 79 20 74 68 | 65 20 6d 65 74 61 20 62 |splay th|e meta b|
|000062c0| 75 66 66 65 72 20 69 6e | 73 74 65 61 64 2e 1f 0a |uffer in|stead...|
|000062d0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|000062e0| 2d 62 75 72 79 2d 64 69 | 72 2d 64 69 66 66 73 2d |-bury-di|r-diffs-|
|000062f0| 62 75 66 66 65 72 20 23 | 5b 6e 69 6c 20 22 08 c1 |buffer #|[nil "..|
|00006300| 1a 1b c4 20 88 c5 0b 21 | 89 12 ab 85 c6 5c 6e 21 |... ...!|.....\n!|
|00006310| aa 85 c7 c8 20 0b 5c 22 | 2a 87 22 20 5b 65 64 69 |.... .\"|*." [edi|
|00006320| 66 66 2d 6d 65 74 61 2d | 62 75 66 66 65 72 20 6e |ff-meta-|buffer n|
|00006330| 69 6c 20 77 69 6e 64 20 | 62 75 66 20 62 75 72 79 |il wind |buf bury|
|00006340| 2d 62 75 66 66 65 72 20 | 65 64 69 66 66 2d 67 65 |-buffer |ediff-ge|
|00006350| 74 2d 76 69 73 69 62 6c | 65 2d 62 75 66 66 65 72 |t-visibl|e-buffer|
|00006360| 2d 77 69 6e 64 6f 77 20 | 73 65 6c 65 63 74 2d 77 |-window |select-w|
|00006370| 69 6e 64 6f 77 20 73 65 | 74 2d 77 69 6e 64 6f 77 |indow se|t-window|
|00006380| 2d 62 75 66 66 65 72 20 | 73 65 6c 65 63 74 65 64 |-buffer |selected|
|00006390| 2d 77 69 6e 64 6f 77 5d | 20 33 20 28 23 24 20 2e |-window]| 3 (#$ .|
|000063a0| 20 32 35 32 32 34 29 20 | 6e 69 6c 5d 29 0a 23 40 | 25224) |nil]).#@|
|000063b0| 37 30 20 44 69 73 70 6c | 61 79 20 64 69 66 66 65 |70 Displ|ay diffe|
|000063c0| 72 65 6e 63 65 73 20 61 | 6d 6f 6e 67 20 74 68 65 |rences a|mong the|
|000063d0| 20 64 69 72 65 63 74 6f | 72 69 65 73 20 69 6e 76 | directo|ries inv|
|000063e0| 6f 6c 76 65 64 20 69 6e | 20 73 65 73 73 69 6f 6e |olved in| session|
|000063f0| 20 67 72 6f 75 70 2e 1f | 0a 28 64 65 66 61 6c 69 | group..|.(defali|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
